Repository: incubator-juneau Updated Branches: refs/heads/master 71f29193f -> 28f8b2c70
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server.test/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server.test/pom.xml b/org.apache.juneau.server.test/pom.xml index 2614804..118b801 100644 --- a/org.apache.juneau.server.test/pom.xml +++ b/org.apache.juneau.server.test/pom.xml @@ -12,39 +12,59 @@ * specific language governing permissions and limitations under the License. ***************************************************************************************************************************/ --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.juneau</groupId> - <artifactId>org.apache.juneau.server.test</artifactId> - <version>6.0.0-SNAPSHOT</version> - <name>org.apache.juneau.server.test</name> - <description>org.apache.juneau.server.test</description> - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-server-test</artifactId> + <version>6.0.0-SNAPSHOT</version> + <name>Apache Juneau Server Test</name> + <description>Tests for Juneau Client and Server.</description> + <properties> + <encoding>UTF-8</encoding> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-samples</artifactId> + <version>6.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.3</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.5.0</version> + <executions> + <execution> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <workingDirectory>${basedir}/../org.apache.juneau.samples</workingDirectory> + <executable>java</executable> + <arguments> + <argument>org.apache.juneau.microservice.RestMicroservice</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.classpath b/org.apache.juneau.server/.classpath index a953066..0ab9d57 100755 --- a/org.apache.juneau.server/.classpath +++ b/org.apache.juneau.server/.classpath @@ -1,24 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"> + <classpathentry kind="src" output="target/classes" path="src/main/java"> <attributes> <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.releng"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> <attributes> + <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau"/> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> </attributes> </classpathentry> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau"/> <classpathentry kind="output" path="target/classes"/> </classpath> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.server/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/org.apache.juneau.server/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/<project>=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/.settings/org.eclipse.wst.common.component ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.settings/org.eclipse.wst.common.component b/org.apache.juneau.server/.settings/org.eclipse.wst.common.component index fcc037e..a59f78d 100755 --- a/org.apache.juneau.server/.settings/org.eclipse.wst.common.component +++ b/org.apache.juneau.server/.settings/org.eclipse.wst.common.component @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <wb-module deploy-name="org.apache.juneau.server"> <wb-resource deploy-path="/" source-path="/src/main/java"/> - <wb-resource deploy-path="/" source-path="/src/test/java"/> </wb-module> </project-modules> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/.settings/org.eclipse.wst.validation.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.settings/org.eclipse.wst.validation.prefs b/org.apache.juneau.server/.settings/org.eclipse.wst.validation.prefs index 1d71887..c6b7b01 100755 --- a/org.apache.juneau.server/.settings/org.eclipse.wst.validation.prefs +++ b/org.apache.juneau.server/.settings/org.eclipse.wst.validation.prefs @@ -2,6 +2,7 @@ DELEGATES_PREFERENCE=delegateValidatorList USER_BUILD_PREFERENCE=enabledBuildValidatorList USER_MANUAL_PREFERENCE=enabledManualValidatorList USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633 +disabled=06target eclipse.preferences.version=1 override=true suspend=false http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/META-INF/MANIFEST.MF b/org.apache.juneau.server/META-INF/MANIFEST.MF index 39fa87f..2f443dc 100755 --- a/org.apache.juneau.server/META-INF/MANIFEST.MF +++ b/org.apache.juneau.server/META-INF/MANIFEST.MF @@ -10,10 +10,7 @@ Import-Package: com.hp.hpl.jena.rdf.model;resolution:=optional, com.hp.hpl.jena.shared;resolution:=optional, javax.servlet, - javax.servlet.http, - javax.ws.rs;resolution:=optional, - javax.ws.rs.core;resolution:=optional, - javax.ws.rs.ext;resolution:=optional + javax.servlet.http Export-Package: org.apache.juneau.server, org.apache.juneau.server.annotation, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/build.properties ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/build.properties b/org.apache.juneau.server/build.properties index 8273e93..cb2c599 100755 --- a/org.apache.juneau.server/build.properties +++ b/org.apache.juneau.server/build.properties @@ -19,6 +19,4 @@ bin.includes = META-INF/,\ .,\ OSGI-INF/ bin.excludes = **/doc-files/** -# We include JAX-RS in the extra classpath since it's not available in Jazz. -jars.extra.classpath = lib/jaxrs/jsr311-api-1.1.1.jar nls_exclude=**/*.html http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/pom.xml b/org.apache.juneau.server/pom.xml index e368523..29c9c7e 100644 --- a/org.apache.juneau.server/pom.xml +++ b/org.apache.juneau.server/pom.xml @@ -12,39 +12,36 @@ * specific language governing permissions and limitations under the License. ***************************************************************************************************************************/ --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-server</artifactId> - <version>6.0.0-SNAPSHOT</version> - <name>org.apache.juneau.server</name> - <description>org.apache.juneau.server</description> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <artifactId>juneau-server</artifactId> + <name>Apache Juneau Server</name> + <description>REST servlet API</description> + + <parent> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-all</artifactId> + <version>6.0.0-SNAPSHOT</version> + <relativePath>../org.apache.juneau.releng/pom.xml</relativePath> + </parent> + <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-core</artifactId> + <version>${juneau.version}</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + <scope>provided</scope> </dependency> </dependencies> - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.classpath b/org.apache.juneau/.classpath index 11528f1..75cedcb 100755 --- a/org.apache.juneau/.classpath +++ b/org.apache.juneau/.classpath @@ -19,7 +19,6 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.releng"/> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau/.settings/org.eclipse.core.resources.prefs index dc1b414..29abf99 100644 --- a/org.apache.juneau/.settings/org.eclipse.core.resources.prefs +++ b/org.apache.juneau/.settings/org.eclipse.core.resources.prefs @@ -3,3 +3,4 @@ encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding//src/test/resources=UTF-8 +encoding/<project>=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau/.settings/org.eclipse.wst.common.component ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.settings/org.eclipse.wst.common.component b/org.apache.juneau/.settings/org.eclipse.wst.common.component index d5aed24..92db199 100755 --- a/org.apache.juneau/.settings/org.eclipse.wst.common.component +++ b/org.apache.juneau/.settings/org.eclipse.wst.common.component @@ -2,7 +2,5 @@ <wb-module deploy-name="org.apache.juneau"> <wb-resource deploy-path="/" source-path="/src/main/java"/> <wb-resource deploy-path="/" source-path="/src/main/resources"/> - <wb-resource deploy-path="/" source-path="/src/test/java"/> - <wb-resource deploy-path="/" source-path="/src/test/resources"/> </wb-module> </project-modules> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau/pom.xml b/org.apache.juneau/pom.xml index e34d125..78f4f96 100644 --- a/org.apache.juneau/pom.xml +++ b/org.apache.juneau/pom.xml @@ -15,47 +15,22 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.juneau</groupId> <artifactId>juneau-core</artifactId> - <version>6.0.0-SNAPSHOT</version> - <name>org.apache.juneau</name> - <description>org.apache.juneau</description> - <properties> - <encoding>UTF-8</encoding> - </properties> + <name>Apache Juneau Core</name> + <description>Base toolkit for serializers, parsers, and bean contexts.</description> + + <parent> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-all</artifactId> + <version>6.0.0-SNAPSHOT</version> + <relativePath>../org.apache.juneau.releng/pom.xml</relativePath> + </parent> + <dependencies> <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId> <version>2.7.1</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - <configuration> - <includes> - <include>**/CT_*.class</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/org.apache.juneau/src/test/resources/log4j.properties b/org.apache.juneau/src/test/resources/log4j.properties index 6e15dfc..571e55f 100644 --- a/org.apache.juneau/src/test/resources/log4j.properties +++ b/org.apache.juneau/src/test/resources/log4j.properties @@ -12,7 +12,7 @@ # * * # *************************************************************************************************************************** - Default logging is for WARN and higher +# Default logging is for WARN and higher log4j.rootLogger=INFO, stdout, file ################################
