Repository: incubator-juneau Updated Branches: refs/heads/master 26e0b485a -> b9f31b819
JUNEAU-11 Created a root pom.xml. Reference ASF's parent. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/b9f31b81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/b9f31b81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/b9f31b81 Branch: refs/heads/master Commit: b9f31b81906d4fdba4c4a914429234574319f51c Parents: 26e0b48 Author: John D. Ament <[email protected]> Authored: Mon Aug 8 19:01:02 2016 -0400 Committer: John D. Ament <[email protected]> Committed: Mon Aug 8 19:01:02 2016 -0400 ---------------------------------------------------------------------- .gitignore | 3 +- org.apache.juneau.client/.classpath | 45 +++--- org.apache.juneau.client/.project | 39 +++--- .../.settings/org.eclipse.m2e.core.prefs | 4 - org.apache.juneau.client/pom.xml | 6 +- org.apache.juneau.distrib/pom.xml | 10 +- org.apache.juneau.microservice/.classpath | 61 +++++---- org.apache.juneau.microservice/.project | 41 +++--- .../.settings/org.eclipse.m2e.core.prefs | 4 - org.apache.juneau.microservice/pom.xml | 10 +- org.apache.juneau.releng/pom.xml | 137 ------------------- org.apache.juneau.samples/.classpath | 72 +++++----- org.apache.juneau.samples/.project | 42 +++--- .../.settings/org.eclipse.m2e.core.prefs | 4 - org.apache.juneau.samples/pom.xml | 12 +- org.apache.juneau.server.test/.classpath | 65 +++++---- org.apache.juneau.server.test/.project | 37 ++--- .../.settings/org.eclipse.m2e.core.prefs | 4 - org.apache.juneau.server.test/pom.xml | 2 +- org.apache.juneau.server/.classpath | 45 +++--- org.apache.juneau.server/.project | 39 +++--- .../.settings/org.eclipse.m2e.core.prefs | 4 - org.apache.juneau.server/pom.xml | 8 +- org.apache.juneau/.classpath | 53 +++---- org.apache.juneau/.project | 37 ++--- .../.settings/org.eclipse.m2e.core.prefs | 4 - org.apache.juneau/pom.xml | 12 +- pom.xml | 133 ++++++++++++++++++ 28 files changed, 433 insertions(+), 500 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 5e7c264..137e5d1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.class /.DS_Store .idea -*.iml \ No newline at end of file +*.iml +target \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.client/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.client/.classpath b/org.apache.juneau.client/.classpath old mode 100755 new mode 100644 index 9a888a5..bc91718 --- a/org.apache.juneau.client/.classpath +++ b/org.apache.juneau.client/.classpath @@ -1,28 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <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.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> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="/juneau-core"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1/jena-iri-0.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.client/.project ---------------------------------------------------------------------- diff --git a/org.apache.juneau.client/.project b/org.apache.juneau.client/.project old mode 100755 new mode 100644 index 66595a4..f61150f --- a/org.apache.juneau.client/.project +++ b/org.apache.juneau.client/.project @@ -1,23 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.apache.juneau.client</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>juneau-client</name> + <comment>REST client API. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>juneau-core</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.client/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.client/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.client/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/org.apache.juneau.client/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.client/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.client/pom.xml b/org.apache.juneau.client/pom.xml index f6195a4..78d15a6 100644 --- a/org.apache.juneau.client/pom.xml +++ b/org.apache.juneau.client/pom.xml @@ -21,9 +21,9 @@ <parent> <groupId>org.apache.juneau</groupId> - <artifactId>juneau-all</artifactId> - <version>6.0.0-SNAPSHOT</version> - <relativePath>../org.apache.juneau.releng/pom.xml</relativePath> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.distrib/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.distrib/pom.xml b/org.apache.juneau.distrib/pom.xml index 85b9dee..025487c 100644 --- a/org.apache.juneau.distrib/pom.xml +++ b/org.apache.juneau.distrib/pom.xml @@ -22,16 +22,16 @@ <parent> <groupId>org.apache.juneau</groupId> - <artifactId>juneau-all</artifactId> - <version>6.0.0-SNAPSHOT</version> - <relativePath>../org.apache.juneau.releng/pom.xml</relativePath> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-microservice</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> @@ -68,7 +68,7 @@ <outputDirectory>${basedir}/target/</outputDirectory> <resources> <resource> - <directory>${basedir}/../org.apache.juneau.releng/target</directory> + <directory>${basedir}/../target</directory> <includes> <include> juneau-all-${juneau.version}-javadoc.jar http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.microservice/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice/.classpath b/org.apache.juneau.microservice/.classpath old mode 100755 new mode 100644 index 28e7893..a41b12f --- a/org.apache.juneau.microservice/.classpath +++ b/org.apache.juneau.microservice/.classpath @@ -1,29 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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" 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" exported="true" kind="src" path="/org.apache.juneau.server"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.client"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau"/> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <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 kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.1/mail-1.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="/juneau-server"/> + <classpathentry kind="src" path="/juneau-core"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1/jena-iri-0.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/> + <classpathentry kind="src" path="/juneau-client"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/aggregate/jetty-all-server/8.1.0.v20120127/jetty-all-server-8.1.0.v20120127.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jaspic_1.0_spec/1.0/geronimo-jaspic_1.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-commons/3.1/asm-commons-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-tree/3.1/asm-tree-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.3.1/commons-fileupload-1.3.1.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.microservice/.project ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice/.project b/org.apache.juneau.microservice/.project old mode 100755 new mode 100644 index 8965b6a..c3eaa4a --- a/org.apache.juneau.microservice/.project +++ b/org.apache.juneau.microservice/.project @@ -1,23 +1,18 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.apache.juneau.microservice</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>juneau-microservice</name> + <comment>API for creating standalone executable jars that can be used to start lightweight configurable REST interfaces. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>juneau-server</project> + <project>juneau-core</project> + <project>juneau-client</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.microservice/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.microservice/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/org.apache.juneau.microservice/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.microservice/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice/pom.xml b/org.apache.juneau.microservice/pom.xml index c8f1b8a..1f552d0 100644 --- a/org.apache.juneau.microservice/pom.xml +++ b/org.apache.juneau.microservice/pom.xml @@ -21,21 +21,21 @@ <parent> <groupId>org.apache.juneau</groupId> - <artifactId>juneau-all</artifactId> - <version>6.0.0-SNAPSHOT</version> - <relativePath>../org.apache.juneau.releng/pom.xml</relativePath> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-server</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-client</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.releng/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.releng/pom.xml b/org.apache.juneau.releng/pom.xml deleted file mode 100644 index 57c4276..0000000 --- a/org.apache.juneau.releng/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ -<!-- -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * 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-all</artifactId> - <version>6.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Apache Juneau</name> - <description>All the Apache Juneau content in one convenient package.</description> - - <properties> - <juneau.version>6.0.0-SNAPSHOT</juneau.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <encoding>UTF-8</encoding> - </properties> - - <modules> - <module>../org.apache.juneau</module> - <module>../org.apache.juneau.client</module> - <module>../org.apache.juneau.server</module> - <module>../org.apache.juneau.microservice</module> - <module>../org.apache.juneau.samples</module> - <module>../org.apache.juneau.server.test</module> - <module>../org.apache.juneau.distrib</module> - </modules> - - <dependencies> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <show>protected</show> - <windowtitle>${project.name} ${project.version}</windowtitle> - <author>true</author> - <linksource>true</linksource> - <source>1.6</source> - <bootclasspath>${sun.boot.class.path}</bootclasspath> - <overview>${basedir}/../org.apache.juneau/src/main/java/overview.html</overview> - <stylesheetfile>${basedir}/../org.apache.juneau.releng/javadoc.css</stylesheetfile> - <use>true</use> - <additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none</additionalparam> - <verbose>false</verbose> - <excludePackageNames>*proto*</excludePackageNames> - <links> - <link>http://docs.oracle.com/javase/7/docs/api/</link> - <link>http://docs.oracle.com/javaee/5/api/</link> - </links> - </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>aggregate</id> - <phase>package</phase> - <goals> - <goal>aggregate-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <configuration> - <descriptors> - <descriptor>src/assembly/all.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.samples/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.samples/.classpath b/org.apache.juneau.samples/.classpath old mode 100755 new mode 100644 index d14ff0d..1f18766 --- a/org.apache.juneau.samples/.classpath +++ b/org.apache.juneau.samples/.classpath @@ -1,35 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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 excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <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" exported="true" kind="src" path="/org.apache.juneau.microservice"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.server"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.client"/> - <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 kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.1/mail-1.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="/juneau-microservice"/> + <classpathentry kind="src" path="/juneau-server"/> + <classpathentry kind="src" path="/juneau-core"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.2/jena-iri-0.9.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/> + <classpathentry kind="src" path="/juneau-client"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/aggregate/jetty-all-server/8.1.0.v20120127/jetty-all-server-8.1.0.v20120127.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jaspic_1.0_spec/1.0/geronimo-jaspic_1.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-commons/3.1/asm-commons-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-tree/3.1/asm-tree-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.3.1/commons-fileupload-1.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.10.2.0/derby-10.10.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.samples/.project ---------------------------------------------------------------------- diff --git a/org.apache.juneau.samples/.project b/org.apache.juneau.samples/.project old mode 100755 new mode 100644 index 43bdb80..6b4b5be --- a/org.apache.juneau.samples/.project +++ b/org.apache.juneau.samples/.project @@ -1,23 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.apache.juneau.samples</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>juneau-samples</name> + <comment>Sample code packaged as a microservice. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>juneau-microservice</project> + <project>juneau-server</project> + <project>juneau-core</project> + <project>juneau-client</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.samples/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.samples/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.samples/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/org.apache.juneau.samples/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.samples/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.samples/pom.xml b/org.apache.juneau.samples/pom.xml index 1a45ca9..787c198 100644 --- a/org.apache.juneau.samples/pom.xml +++ b/org.apache.juneau.samples/pom.xml @@ -15,19 +15,25 @@ <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> + + <parent> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <artifactId>juneau-samples</artifactId> - <version>6.0.0-SNAPSHOT</version> <name>Apache Juneau Samples</name> <description>Sample code packaged as a microservice.</description> <properties> <encoding>UTF-8</encoding> + <maven.test.skip>true</maven.test.skip> </properties> <dependencies> <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-microservice</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.jena</groupId> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server.test/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server.test/.classpath b/org.apache.juneau.server.test/.classpath old mode 100755 new mode 100644 index 276460c..df48e6a --- a/org.apache.juneau.server.test/.classpath +++ b/org.apache.juneau.server.test/.classpath @@ -1,28 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <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.microservice"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.samples"/> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.1/mail-1.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-samples/6.0.0-SNAPSHOT/juneau-samples-6.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-microservice/6.0.0-SNAPSHOT/juneau-microservice-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-microservice/6.0.0-SNAPSHOT/juneau-microservice-6.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-server/6.0.0-SNAPSHOT/juneau-server-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-server/6.0.0-SNAPSHOT/juneau-server-6.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-core/6.0.0-SNAPSHOT/juneau-core-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-core/6.0.0-SNAPSHOT/juneau-core-6.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.2/jena-iri-0.9.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-client/6.0.0-SNAPSHOT/juneau-client-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-client/6.0.0-SNAPSHOT/juneau-client-6.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/aggregate/jetty-all-server/8.1.0.v20120127/jetty-all-server-8.1.0.v20120127.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jaspic_1.0_spec/1.0/geronimo-jaspic_1.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-commons/3.1/asm-commons-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-tree/3.1/asm-tree-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.3.1/commons-fileupload-1.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.10.2.0/derby-10.10.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server.test/.project ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server.test/.project b/org.apache.juneau.server.test/.project old mode 100755 new mode 100644 index b4f35a1..40eb0ff --- a/org.apache.juneau.server.test/.project +++ b/org.apache.juneau.server.test/.project @@ -1,23 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.apache.juneau.server.test</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>juneau-server-test</name> + <comment>Tests for Juneau Client and Server. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server.test/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server.test/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.server.test/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/org.apache.juneau.server.test/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/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 4ac54bb..f6dbb60 100644 --- a/org.apache.juneau.server.test/pom.xml +++ b/org.apache.juneau.server.test/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-samples</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.classpath b/org.apache.juneau.server/.classpath old mode 100755 new mode 100644 index cc7794e..674cc09 --- a/org.apache.juneau.server/.classpath +++ b/org.apache.juneau.server/.classpath @@ -1,30 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="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" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" path="src/main/resources"/> - <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> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="/juneau-core"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1/jena-iri-0.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server/.project ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.project b/org.apache.juneau.server/.project old mode 100755 new mode 100644 index 1f866fd..a200613 --- a/org.apache.juneau.server/.project +++ b/org.apache.juneau.server/.project @@ -1,23 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.apache.juneau.server</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>juneau-server</name> + <comment>REST servlet API. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>juneau-core</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.server/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/org.apache.juneau.server/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau.server/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server/pom.xml b/org.apache.juneau.server/pom.xml index 29c9c7e..1860be2 100644 --- a/org.apache.juneau.server/pom.xml +++ b/org.apache.juneau.server/pom.xml @@ -18,12 +18,12 @@ <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> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.classpath b/org.apache.juneau/.classpath old mode 100755 new mode 100644 index 6211b0b..de3d15e --- a/org.apache.juneau/.classpath +++ b/org.apache.juneau/.classpath @@ -1,38 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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 excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="ignore_optional_problems" value="true"/> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <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 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="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1/jena-iri-0.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau/.project ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.project b/org.apache.juneau/.project old mode 100755 new mode 100644 index 83f3395..920091a --- a/org.apache.juneau/.project +++ b/org.apache.juneau/.project @@ -1,23 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.apache.juneau</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>juneau-core</name> + <comment>Base toolkit for serializers, parsers, and bean contexts. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/org.apache.juneau/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/org.apache.juneau/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau/pom.xml b/org.apache.juneau/pom.xml index 78f4f96..e970ac4 100644 --- a/org.apache.juneau/pom.xml +++ b/org.apache.juneau/pom.xml @@ -21,9 +21,9 @@ <parent> <groupId>org.apache.juneau</groupId> - <artifactId>juneau-all</artifactId> - <version>6.0.0-SNAPSHOT</version> - <relativePath>../org.apache.juneau.releng/pom.xml</relativePath> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> @@ -32,5 +32,11 @@ <artifactId>jena-core</artifactId> <version>2.7.1</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b9f31b81/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6fd35d1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,133 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ 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</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Apache Juneau (incubating)</name> + <description>All the Apache Juneau content in one convenient package.</description> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> + </parent> + <properties> + <juneau.version>6.0.0-incubating-SNAPSHOT</juneau.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <encoding>UTF-8</encoding> + </properties> + + <modules> + <module>org.apache.juneau</module> + <module>org.apache.juneau.client</module> + <module>org.apache.juneau.server</module> + <module>org.apache.juneau.microservice</module> + <module>org.apache.juneau.samples</module> + <module>org.apache.juneau.server.test</module> + <module>org.apache.juneau.distrib</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <configuration> + <descriptors> + <descriptor>src/assembly/all.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <show>protected</show> + <windowtitle>${project.name} ${project.version}</windowtitle> + <author>true</author> + <linksource>true</linksource> + <source>1.6</source> + <bootclasspath>${sun.boot.class.path}</bootclasspath> + <overview>${basedir}/org.apache.juneau/src/main/java/overview.html</overview> + <stylesheetfile>${basedir}/org.apache.juneau.releng/javadoc.css</stylesheetfile> + <use>true</use> + <additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none</additionalparam> + <verbose>false</verbose> + <excludePackageNames>*proto*</excludePackageNames> + <links> + <link>http://docs.oracle.com/javase/7/docs/api/</link> + <link>http://docs.oracle.com/javaee/5/api/</link> + </links> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>aggregate</id> + <phase>package</phase> + <goals> + <goal>aggregate-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> \ No newline at end of file
