Skip to content

Commit cf68dda

Browse files
ngallagherngallagher
committed
Split project up in to independent modules
1 parent 222b3fb commit cf68dda

File tree

445 files changed

+1377
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+1377
-345
lines changed

‎simple-core/.classpath

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎simple-demo/simple-demo-chat/.classpath

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
4-
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
5-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
725
<classpathentry kind="output" path="target/classes"/>
826
</classpath>

‎simple-demo/simple-demo-chat/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>org.simpleframework</groupId>
24-
<artifactId>simple</artifactId>
24+
<artifactId>simple-http</artifactId>
2525
<version>6.0</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.simpleframework</groupId>
29+
<artifactId>simple-common</artifactId>
30+
<version>6.0</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.simpleframework</groupId>
34+
<artifactId>simple-transport</artifactId>
35+
<version>6.0</version>
36+
</dependency>
2737
<dependency>
2838
<groupId>org.simpleframework</groupId>
2939
<artifactId>simple-demo</artifactId>

‎simple-demo/simple-demo-graph/.classpath

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
4-
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
6-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
725
<classpathentry kind="output" path="target/classes"/>
826
</classpath>

‎simple-demo/simple-demo-graph/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>org.simpleframework</groupId>
24-
<artifactId>simple</artifactId>
24+
<artifactId>simple-http</artifactId>
2525
<version>6.0</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.simpleframework</groupId>
29+
<artifactId>simple-common</artifactId>
30+
<version>6.0</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.simpleframework</groupId>
34+
<artifactId>simple-transport</artifactId>
35+
<version>6.0</version>
36+
</dependency>
2737
<dependency>
2838
<groupId>org.simpleframework</groupId>
2939
<artifactId>simple-demo</artifactId>

‎simple-demo/simple-demo-table/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎simple-demo/simple-demo/.classpath

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
4-
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
5-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
725
<classpathentry kind="output" path="target/classes"/>
826
</classpath>

‎simple-demo/simple-demo/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>org.simpleframework</groupId>
24-
<artifactId>simple</artifactId>
24+
<artifactId>simple-http</artifactId>
2525
<version>6.0</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.simpleframework</groupId>
29+
<artifactId>simple-common</artifactId>
30+
<version>6.0</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.simpleframework</groupId>
34+
<artifactId>simple-transport</artifactId>
35+
<version>6.0</version>
36+
</dependency>
2737
<dependency>
2838
<groupId>log4j</groupId>
2939
<artifactId>log4j</artifactId>

‎simple-demo/simple-demo/src/main/java/org/simpleframework/demo/trace/LogAnalyzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.concurrent.atomic.AtomicLong;
99

1010
import org.apache.log4j.Logger;
11+
import org.simpleframework.common.thread.Daemon;
1112
import org.simpleframework.transport.trace.Analyzer;
1213
import org.simpleframework.transport.trace.Trace;
13-
import org.simpleframework.util.thread.Daemon;
1414

1515
public class LogAnalyzer extends Daemon implements Analyzer {
1616

‎simple-test/pom.xml

Lines changed: 95 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,96 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.simpleframework</groupId>
5-
<artifactId>simple-test</artifactId>
6-
<packaging>jar</packaging>
7-
<version>6.0</version>
8-
<name>Simple</name>
9-
<url>http://www.simpleframework.org</url>
10-
<description>Simple is a high performance asynchronous HTTP server for Java</description>
11-
<licenses>
12-
<license>
13-
<name>The Apache Software License, Version 2.0</name>
14-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
15-
<distribution>repo</distribution>
16-
</license>
17-
</licenses>
18-
<scm>
19-
<url>http://simpleweb.svn.sourceforge.net/viewvc/simpleweb/trunk/tool</url>
20-
<connection>https://simpleweb.svn.sourceforge.net/svnroot/simpleweb/trunk/tool</connection>
21-
</scm>
22-
<dependencies>
23-
<dependency>
24-
<groupId>junit</groupId>
25-
<artifactId>junit</artifactId>
26-
<version>3.8.1</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.simpleframework</groupId>
30-
<artifactId>simple-xml</artifactId>
31-
<version>2.7</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.simpleframework</groupId>
35-
<artifactId>simple</artifactId>
36-
<version>6.0</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>javax.mail</groupId>
40-
<artifactId>mail</artifactId>
41-
<version>1.4.5</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>commons-httpclient</groupId>
45-
<artifactId>commons-httpclient</artifactId>
46-
<version>3.1</version>
47-
</dependency>
48-
</dependencies>
49-
<reporting>
50-
<plugins>
51-
<plugin>
52-
<groupId>org.codehaus.mojo</groupId>
53-
<artifactId>cobertura-maven-plugin</artifactId>
54-
</plugin>
55-
</plugins>
56-
</reporting>
57-
<build>
58-
<plugins>
59-
<plugin>
60-
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-compiler-plugin</artifactId>
62-
<configuration>
63-
<source>1.5</source>
64-
<target>1.5</target>
65-
</configuration>
66-
</plugin>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-source-plugin</artifactId>
70-
<executions>
71-
<execution>
72-
<id>attach-sources</id>
73-
<goals>
74-
<goal>jar</goal>
75-
</goals>
76-
</execution>
77-
</executions>
78-
</plugin>
79-
</plugins>
80-
<resources>
81-
<resource>
82-
<directory>src/main/resources</directory>
83-
<filtering>true</filtering>
84-
</resource>
85-
</resources>
86-
</build>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.simpleframework</groupId>
4+
<artifactId>simple-test</artifactId>
5+
<packaging>jar</packaging>
6+
<version>6.0</version>
7+
<name>Simple</name>
8+
<url>http://www.simpleframework.org</url>
9+
<description>Simple is a high performance asynchronous HTTP server for Java</description>
10+
<licenses>
11+
<license>
12+
<name>The Apache Software License, Version 2.0</name>
13+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
14+
<distribution>repo</distribution>
15+
</license>
16+
</licenses>
17+
<scm>
18+
<url>http://simpleweb.svn.sourceforge.net/viewvc/simpleweb/trunk/tool</url>
19+
<connection>https://simpleweb.svn.sourceforge.net/svnroot/simpleweb/trunk/tool</connection>
20+
</scm>
21+
<dependencies>
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>3.8.1</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.simpleframework</groupId>
29+
<artifactId>simple-xml</artifactId>
30+
<version>2.7</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.simpleframework</groupId>
34+
<artifactId>simple-http</artifactId>
35+
<version>6.0</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.simpleframework</groupId>
39+
<artifactId>simple-common</artifactId>
40+
<version>6.0</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.simpleframework</groupId>
44+
<artifactId>simple-transport</artifactId>
45+
<version>6.0</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>javax.mail</groupId>
49+
<artifactId>mail</artifactId>
50+
<version>1.4.5</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>commons-httpclient</groupId>
54+
<artifactId>commons-httpclient</artifactId>
55+
<version>3.1</version>
56+
</dependency>
57+
</dependencies>
58+
<reporting>
59+
<plugins>
60+
<plugin>
61+
<groupId>org.codehaus.mojo</groupId>
62+
<artifactId>cobertura-maven-plugin</artifactId>
63+
</plugin>
64+
</plugins>
65+
</reporting>
66+
<build>
67+
<plugins>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-compiler-plugin</artifactId>
71+
<configuration>
72+
<source>1.5</source>
73+
<target>1.5</target>
74+
</configuration>
75+
</plugin>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-source-plugin</artifactId>
79+
<executions>
80+
<execution>
81+
<id>attach-sources</id>
82+
<goals>
83+
<goal>jar</goal>
84+
</goals>
85+
</execution>
86+
</executions>
87+
</plugin>
88+
</plugins>
89+
<resources>
90+
<resource>
91+
<directory>src/main/resources</directory>
92+
<filtering>true</filtering>
93+
</resource>
94+
</resources>
95+
</build>
8796
</project>

0 commit comments

Comments
 (0)