Repository: incubator-juneau Updated Branches: refs/heads/master 1c5ac9a92 -> 990b5d22a
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/.classpath ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/.classpath b/juneau-examples/juneau-examples-core/.classpath index 5adac7b..4e14a6d 100644 --- a/juneau-examples/juneau-examples-core/.classpath +++ b/juneau-examples/juneau-examples-core/.classpath @@ -6,19 +6,21 @@ <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"> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry kind="src" path="src/assembly"/> + <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"> + <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="src" output="target/test-classes" path="src/test/java"> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> - <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/.gitignore ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/.gitignore b/juneau-examples/juneau-examples-core/.gitignore new file mode 100644 index 0000000..9bb88d3 --- /dev/null +++ b/juneau-examples/juneau-examples-core/.gitignore @@ -0,0 +1 @@ +/.DS_Store http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/build-overlay/.classpath ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/build-overlay/.classpath b/juneau-examples/juneau-examples-core/build-overlay/.classpath new file mode 100644 index 0000000..0060db7 --- /dev/null +++ b/juneau-examples/juneau-examples-core/build-overlay/.classpath @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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" 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="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> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/build-overlay/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/build-overlay/pom.xml b/juneau-examples/juneau-examples-core/build-overlay/pom.xml new file mode 100644 index 0000000..b269d93 --- /dev/null +++ b/juneau-examples/juneau-examples-core/build-overlay/pom.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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-examples-core</artifactId> + <version>${project.version}</version> + <name>Apache Juneau Core Examples</name> + <description>Apache Juneau Examples for Core parser functionality</description> + + <properties> + <!-- Skip javadoc generation since we generate them in the aggregate pom --> + <maven.javadoc.skip>true</maven.javadoc.skip> + + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-marshall</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-marshall-rdf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-dto</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-svl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>jena-core</artifactId> + <version>${jena.version}</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/pom.xml b/juneau-examples/juneau-examples-core/pom.xml index 7c7ab21..17ce444 100644 --- a/juneau-examples/juneau-examples-core/pom.xml +++ b/juneau-examples/juneau-examples-core/pom.xml @@ -47,9 +47,47 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-dto</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-svl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>juneau-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>apache-juneau-examples-core-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/src/assembly/bin.xml b/juneau-examples/juneau-examples-core/src/assembly/bin.xml new file mode 100644 index 0000000..db8d6bb --- /dev/null +++ b/juneau-examples/juneau-examples-core/src/assembly/bin.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> + +<!-- + This assembly is used to create the template zip file that developers use to import into Eclipse to start their + own projects. + --> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>/</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <includes> + <include>src/main/**</include> + <include>src/test/**</include> + <include>.settings/**</include> + <include>.project</include> + </includes> + </fileSet> + <fileSet> + <directory>${basedir}/build-overlay</directory> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/src/main/resources/empty.txt ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/src/main/resources/empty.txt b/juneau-examples/juneau-examples-core/src/main/resources/empty.txt new file mode 100644 index 0000000..69ece92 --- /dev/null +++ b/juneau-examples/juneau-examples-core/src/main/resources/empty.txt @@ -0,0 +1,12 @@ + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-core/src/test/java/empty.txt ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/src/test/java/empty.txt b/juneau-examples/juneau-examples-core/src/test/java/empty.txt new file mode 100644 index 0000000..69ece92 --- /dev/null +++ b/juneau-examples/juneau-examples-core/src/test/java/empty.txt @@ -0,0 +1,12 @@ + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-rest/.classpath ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/.classpath b/juneau-examples/juneau-examples-rest/.classpath index 0060db7..74a5325 100644 --- a/juneau-examples/juneau-examples-rest/.classpath +++ b/juneau-examples/juneau-examples-rest/.classpath @@ -17,6 +17,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="src" path="src/assembly"/> <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"/> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-rest/build-overlay/.classpath ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/build-overlay/.classpath b/juneau-examples/juneau-examples-rest/build-overlay/.classpath new file mode 100644 index 0000000..0060db7 --- /dev/null +++ b/juneau-examples/juneau-examples-rest/build-overlay/.classpath @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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" 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="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> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-rest/build-overlay/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/build-overlay/pom.xml b/juneau-examples/juneau-examples-rest/build-overlay/pom.xml new file mode 100644 index 0000000..5662209 --- /dev/null +++ b/juneau-examples/juneau-examples-rest/build-overlay/pom.xml @@ -0,0 +1,160 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> +<!-- + This project is meant to be used as a starting point for developers to use in creating their own REST microservices. + It creates a parent REST interface on port 10000 with a single child hello-world resource. + This POM is likewise meant to be used as a starting point for developers. It creates an uber-jar + to run the microserice from the command line. Copy the jar as well as the .cfg file and start it + with java -jar juneau-microservice-template-1.0.0.jar microservice.cfg + The group/artifact/version information is meant to be overwritten by developers to match their own needs. +--> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-examples-rest</artifactId> + <name>Apache Juneau REST Examples</name> + <version>${version}</version> + <description>Sample code packaged as a microservice.</description> + + <properties> + <encoding>UTF-8</encoding> + + <!-- Java 8 required because Jetty requires it. --> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + + + <dependencies> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-microservice-server</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>jena-core</artifactId> + <version>${jena.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${fileupload.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${httpclient.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- This runs the _TestSuite class. You must run within the testsuite + so the REST microservice is started for the tests. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/_TestSuite.java</include> + </includes> + </configuration> + </plugin> + + <!-- This packages the samples into an executable jar. Use: java -jar + juneau-examples-uber.jar Needs the examples.cfg copied below in the same + directory. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + <minimizeJar>false</minimizeJar> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Main-Class>org.apache.juneau.microservice.RestMicroservice</Main-Class> + <Rest-Resources>org.apache.juneau.examples.rest.RootResources</Rest-Resources> + <Main-ConfigFile>examples.cfg</Main-ConfigFile> + </manifestEntries> + </transformer> + </transformers> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- Attaches the examples.cfg to this artifact --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.12</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>examples.cfg</file> + <type>cfg</type> + <classifier>samples</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-rest/juneau-examples-rest.launch ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/juneau-examples-rest.launch b/juneau-examples/juneau-examples-rest/juneau-examples-rest.launch index ba4422c..baf89fb 100644 --- a/juneau-examples/juneau-examples-rest/juneau-examples-rest.launch +++ b/juneau-examples/juneau-examples-rest/juneau-examples-rest.launch @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> -<stringAttribute key="bad_container_name" value="/juneau-examples"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> <booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/> <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-rest/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/pom.xml b/juneau-examples/juneau-examples-rest/pom.xml index 4b81a0a..0f38a24 100644 --- a/juneau-examples/juneau-examples-rest/pom.xml +++ b/juneau-examples/juneau-examples-rest/pom.xml @@ -155,6 +155,25 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>juneau-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>apache-juneau-examples-rest-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-examples/juneau-examples-rest/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/assembly/bin.xml b/juneau-examples/juneau-examples-rest/src/assembly/bin.xml new file mode 100644 index 0000000..6f29fe6 --- /dev/null +++ b/juneau-examples/juneau-examples-rest/src/assembly/bin.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> + +<!-- + This assembly is used to create the template zip file that developers use to import into Eclipse to start their + own projects. + --> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>/</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <includes> + <include>src/main/**</include> + <include>src/test/**</include> + <include>.settings/**</include> + <include>.project</include> + <include>jetty.xml</include> + <include>juneau-examples-rest.launch</include> + <include>examples.cfg</include> + </includes> + </fileSet> + <fileSet> + <directory>${basedir}/build-overlay</directory> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/.DS_Store ---------------------------------------------------------------------- diff --git a/juneau-microservice/.DS_Store b/juneau-microservice/.DS_Store index b0b1a8b..3dbaec8 100644 Binary files a/juneau-microservice/.DS_Store and b/juneau-microservice/.DS_Store differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/.classpath ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/.classpath b/juneau-microservice/juneau-microservice-template/.classpath index fd7ad7f..4e17b72 100755 --- a/juneau-microservice/juneau-microservice-template/.classpath +++ b/juneau-microservice/juneau-microservice-template/.classpath @@ -6,6 +6,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="src" path="src/assembly"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"> <attributes> <attribute name="optional" value="true"/> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/META-INF/MANIFEST.MF b/juneau-microservice/juneau-microservice-template/META-INF/MANIFEST.MF index 22d1630..e1589c9 100755 --- a/juneau-microservice/juneau-microservice-template/META-INF/MANIFEST.MF +++ b/juneau-microservice/juneau-microservice-template/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Manifest-Version: 1.0 Main-Class: org.apache.juneau.microservice.RestMicroservice Rest-Resources: org.apache.juneau.microservice.sample.RootResources -Main-ConfigFile: microservice.cfg +Main-ConfigFile: my-microservice.cfg Class-Path: lib/commons-codec-1.9.jar lib/commons-io-1.2.jar http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/build-overlay/.classpath ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/build-overlay/.classpath b/juneau-microservice/juneau-microservice-template/build-overlay/.classpath new file mode 100755 index 0000000..fd7ad7f --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/build-overlay/.classpath @@ -0,0 +1,26 @@ +<?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 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> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/build-overlay/.project ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/build-overlay/.project b/juneau-microservice/juneau-microservice-template/build-overlay/.project new file mode 100755 index 0000000..82b42ef --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/build-overlay/.project @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>my-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> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/build-overlay/my-microservice.launch ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/build-overlay/my-microservice.launch b/juneau-microservice/juneau-microservice-template/build-overlay/my-microservice.launch new file mode 100644 index 0000000..303979a --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/build-overlay/my-microservice.launch @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> +<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> +<booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/> +<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="my-microservice.cfg"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="my-microservice"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> +</launchConfiguration> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/build-overlay/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/build-overlay/pom.xml b/juneau-microservice/juneau-microservice-template/build-overlay/pom.xml new file mode 100644 index 0000000..633002c --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/build-overlay/pom.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> +<!-- + This project is meant to be used as a starting point for developers to use in creating their own REST microservices. + It creates a parent REST interface on port 10000 with a single child hello-world resource. + This POM is likewise meant to be used as a starting point for developers. It creates an uber-jar + to run the microserice from the command line. Copy the jar as well as the .cfg file and start it + with java -jar juneau-microservice-template-1.0.0.jar microservice.cfg + The group/artifact/version information is meant to be overwritten by developers to match their own needs. +--> +<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/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <groupId>my-microservice-group</groupId> + <artifactId>my-microservice</artifactId> + <version>1.0</version> + <name>My microservice</name> + <description>My microservice.</description> + + <properties> + <juneau.version>6.4.1-incubating-SNAPSHOT</juneau.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-microservice-server</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.apache.juneau.microservice.RestMicroservice + </mainClass> + </manifest> + <manifestEntries> + <Rest-Resources>org.apache.juneau.microservice.sample.RootResources + </Rest-Resources> + <Main-ConfigFile>microservice.cfg</Main-ConfigFile> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/*.INF</exclude> <!-- This one may not be required --> + </excludes> + </filter> + </filters> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/build.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/build.xml b/juneau-microservice/juneau-microservice-template/build.xml deleted file mode 100644 index 814a0a5..0000000 --- a/juneau-microservice/juneau-microservice-template/build.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - *************************************************************************************************************************** - * 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. * - *************************************************************************************************************************** ---> -<!-- - Provides a VERY basic ANT script for creating a microservice zip file. ---> -<project name='Microservice' default='Microservice.Build'> - - <target name='Microservice.Build'> - <tstamp/> - <loadproperties srcFile='build.properties'/> - - <path id='classpath'> - <fileset dir='lib' includes='*.jar'/> - </path> - - <delete dir='build' quiet='true'/> - - <copy todir='build/bin'> - <fileset dir='src' excludes='**/*.java'/> - </copy> - <copy todir='build/microservice'> - <fileset dir='.' includes='*.cfg,lib/**'/> - </copy> - - <javac srcdir='src' destdir='build/bin' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false'> - <classpath refid='classpath'/> - </javac> - - <jar jarfile='build/microservice/${jar}' basedir='build/bin' duplicate='fail' level='9' manifest='META-INF/MANIFEST.MF'> - <manifest> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - </jar> - - <zip basedir='build/microservice' destfile='build/${zip}'/> - - <delete dir='build/bin' quiet='true'/> - </target> - -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/microservice.cfg ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/microservice.cfg b/juneau-microservice/juneau-microservice-template/microservice.cfg deleted file mode 100755 index e5fdd9a..0000000 --- a/juneau-microservice/juneau-microservice-template/microservice.cfg +++ /dev/null @@ -1,118 +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. * -# *************************************************************************************************************************** - -#================================================================================ -# Basic configuration file for SaaS microservices -# Subprojects can use this as a starting point. -#================================================================================ - -#================================================================================ -# Services -#================================================================================ -[Services] -REST = org.apache.juneau.microservice.rest.RestApplication - -#================================================================================ -# REST settings -#================================================================================ -[REST] - -jettyXml = jetty.xml - -# Stylesheet to use for HTML views. -# The default options are: -# - servlet:/styles/juneau.css -# - servlet:/styles/devops.css -# Other stylesheets can be referenced relative to the servlet package or working directory. -stylesheet = servlet:/styles/devops.css - -# What to do when the config file is saved. -# Possible values: -# NOTHING - Don't do anything. (default) -# RESTART_SERVER - Restart the Jetty server. -# RESTART_SERVICE - Shutdown and exit with code '3'. -saveConfigAction = RESTART_SERVER - -#================================================================================ -# Logger settings -# See FileHandler Java class for details. -#================================================================================ -[Logging] - -# The directory where to create the log file. -# Default is "." -logDir = logs - -# The name of the log file to create for the main logger. -# The logDir and logFile make up the pattern that's passed to the FileHandler -# constructor. -# If value is not specified, then logging to a file will not be set up. -logFile = microservice.%g.log - -# Whether to append to the existing log file or create a new one. -# Default is false. -append = - -# The SimpleDateFormat format to use for dates. -# Default is "yyyy.MM.dd hh:mm:ss". -dateFormat = - -# The log message format. -# The value can contain any of the following variables: -# {date} - The date, formatted per dateFormat. -# {class} - The class name. -# {method} - The method name. -# {logger} - The logger name. -# {level} - The log level name. -# {msg} - The log message. -# {threadid} - The thread ID. -# {exception} - The localized exception message. -# Default is "[{date} {level}] {msg}%n". -format = - -# The maximum log file size. -# Suffixes available for numbers. -# See ConfigFile.getInt(String,int) for details. -# Default is 1M. -limit = 10M - -# Max number of log files. -# Default is 1. -count = 5 - -# Default log levels. -# Keys are logger names. -# Values are serialized Level POJOs. -levels = { org.apache.juneau:'INFO' } - -# Only print unique stack traces once and then refer to them by a simple 8 character hash identifier. -# Useful for preventing log files from filling up with duplicate stack traces. -# Default is false. -useStackTraceHashes = true - -# The default level for the console logger. -# Default is WARNING. -consoleLevel = - -#================================================================================ -# System properties -#-------------------------------------------------------------------------------- -# These are arbitrary system properties that are set during startup. -#================================================================================ -[SystemProperties] - -# Configure Jetty for StdErrLog Logging -org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog - -# Jetty logging level -org.eclipse.jetty.LEVEL = WARN http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/my-microservice.cfg ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/my-microservice.cfg b/juneau-microservice/juneau-microservice-template/my-microservice.cfg new file mode 100755 index 0000000..2f461a3 --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/my-microservice.cfg @@ -0,0 +1,112 @@ +# *************************************************************************************************************************** +# * 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. * +# *************************************************************************************************************************** + +#================================================================================ +# Basic configuration file for SaaS microservices +# Subprojects can use this as a starting point. +#================================================================================ + +#================================================================================ +# REST settings +#================================================================================ +[REST] + +jettyXml = jetty.xml + +# Stylesheet to use for HTML views. +# The default options are: +# - servlet:/styles/juneau.css +# - servlet:/styles/devops.css +# Other stylesheets can be referenced relative to the servlet package or working directory. +stylesheet = servlet:/styles/devops.css + +# What to do when the config file is saved. +# Possible values: +# NOTHING - Don't do anything. (default) +# RESTART_SERVER - Restart the Jetty server. +# RESTART_SERVICE - Shutdown and exit with code '3'. +saveConfigAction = RESTART_SERVER + +#================================================================================ +# Logger settings +# See FileHandler Java class for details. +#================================================================================ +[Logging] + +# The directory where to create the log file. +# Default is "." +logDir = logs + +# The name of the log file to create for the main logger. +# The logDir and logFile make up the pattern that's passed to the FileHandler +# constructor. +# If value is not specified, then logging to a file will not be set up. +logFile = microservice.%g.log + +# Whether to append to the existing log file or create a new one. +# Default is false. +append = + +# The SimpleDateFormat format to use for dates. +# Default is "yyyy.MM.dd hh:mm:ss". +dateFormat = + +# The log message format. +# The value can contain any of the following variables: +# {date} - The date, formatted per dateFormat. +# {class} - The class name. +# {method} - The method name. +# {logger} - The logger name. +# {level} - The log level name. +# {msg} - The log message. +# {threadid} - The thread ID. +# {exception} - The localized exception message. +# Default is "[{date} {level}] {msg}%n". +format = + +# The maximum log file size. +# Suffixes available for numbers. +# See ConfigFile.getInt(String,int) for details. +# Default is 1M. +limit = 10M + +# Max number of log files. +# Default is 1. +count = 5 + +# Default log levels. +# Keys are logger names. +# Values are serialized Level POJOs. +levels = { org.apache.juneau:'INFO' } + +# Only print unique stack traces once and then refer to them by a simple 8 character hash identifier. +# Useful for preventing log files from filling up with duplicate stack traces. +# Default is false. +useStackTraceHashes = true + +# The default level for the console logger. +# Default is WARNING. +consoleLevel = + +#================================================================================ +# System properties +#-------------------------------------------------------------------------------- +# These are arbitrary system properties that are set during startup. +#================================================================================ +[SystemProperties] + +# Configure Jetty for StdErrLog Logging +org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog + +# Jetty logging level +org.eclipse.jetty.LEVEL = WARN http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/my-microservice.launch ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/my-microservice.launch b/juneau-microservice/juneau-microservice-template/my-microservice.launch new file mode 100644 index 0000000..7179baa --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/my-microservice.launch @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> +<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> +<booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/> +<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="my-microservice.cfg"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-template"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> +</launchConfiguration> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/pom.xml b/juneau-microservice/juneau-microservice-template/pom.xml index 40505ac..876bb05 100644 --- a/juneau-microservice/juneau-microservice-template/pom.xml +++ b/juneau-microservice/juneau-microservice-template/pom.xml @@ -51,53 +51,19 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.apache.juneau.microservice.RestMicroservice - </mainClass> - </manifest> - <manifestEntries> - <Rest-Resources>org.apache.juneau.microservice.sample.RootResources - </Rest-Resources> - <Main-ConfigFile>microservice.cfg</Main-ConfigFile> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <createDependencyReducedPom>false</createDependencyReducedPom> - </configuration> + <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> + <id>juneau-assembly</id> <phase>package</phase> <goals> - <goal>shade</goal> + <goal>single</goal> </goals> <configuration> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.RSA</exclude> - <exclude>META-INF/*.INF</exclude> <!-- This one may not be required --> - </excludes> - </filter> - </filters> + <finalName>apache-juneau-my-microservice-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/src/assembly/bin.xml b/juneau-microservice/juneau-microservice-template/src/assembly/bin.xml new file mode 100644 index 0000000..005fdfd --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/src/assembly/bin.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> + +<!-- + This assembly is used to create the template zip file that developers use to import into Eclipse to start their + own projects. + --> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>/</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <includes> + <include>src/main/**</include> + <include>src/test/**</include> + <include>.settings/**</include> + <include>META-INF/**</include> + <include>jetty.xml</include> + <include>my-microservice.cfg</include> + </includes> + </fileSet> + <fileSet> + <directory>${basedir}/build-overlay</directory> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java index 140baaf..0551978 100755 --- a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java +++ b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java @@ -12,24 +12,30 @@ // *************************************************************************************************************************** package org.apache.juneau.microservice.sample; -import static org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_links; - import org.apache.juneau.microservice.ResourceGroup; import org.apache.juneau.microservice.resources.ConfigResource; import org.apache.juneau.microservice.resources.LogsResource; -import org.apache.juneau.rest.annotation.Property; +import org.apache.juneau.rest.annotation.HtmlDoc; import org.apache.juneau.rest.annotation.RestResource; +import org.apache.juneau.rest.widget.ContentTypeMenuItem; +import org.apache.juneau.rest.widget.StyleMenuItem; /** * Root microservice page. */ @RestResource( path="/", - title="Juneau Microservice Template", - description="Template for creating REST microservices", - properties={ - @Property(name=HTMLDOC_links, value="{options:'?method=OPTIONS'}") - }, + title="My Microservice", + description="Top-level resources page", + htmldoc=@HtmlDoc( + widgets={ + ContentTypeMenuItem.class, + StyleMenuItem.class + }, + links={ + "options: servlet:/?method=OPTIONS" + } + ), children={ HelloWorldResource.class, ConfigResource.class, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html new file mode 100755 index 0000000..8677acb --- /dev/null +++ b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html @@ -0,0 +1,39 @@ +<!-- +/*************************************************************************************************************************** + * 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. + * + ***************************************************************************************************************************/ + --> +<html> +<head> + <style type="text/css"> + /* For viewing in Page Designer */ + @IMPORT url("../../../../../../org.apache.juneau/javadoc.css"); + + /* For viewing in REST interface */ + @IMPORT url("../htdocs/javadoc.css"); + body { + margin: 20px; + } + </style> + <script> + /* Replace all @code and @link tags. */ + window.onload = function() { + document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>'); + document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>'); + } + </script> +</head> +<body> +<p>Sample microservice resources that ship as part of the template</p> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-releng/juneau-distrib/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml index c4c5daa..5488b56 100644 --- a/juneau-releng/juneau-distrib/pom.xml +++ b/juneau-releng/juneau-distrib/pom.xml @@ -193,6 +193,31 @@ <version>${project.version}</version> </artifactItem> + <artifactItem> + <outputDirectory>${project.build.directory}/bin/projects</outputDirectory> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-examples-core</artifactId> + <classifier>bin</classifier> + <type>zip</type> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <outputDirectory>${project.build.directory}/bin/projects</outputDirectory> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-examples-rest</artifactId> + <classifier>bin</classifier> + <type>zip</type> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <outputDirectory>${project.build.directory}/bin/projects</outputDirectory> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-microservice-template</artifactId> + <classifier>bin</classifier> + <type>zip</type> + <version>${project.version}</version> + </artifactItem> + </artifactItems> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html index 3881f3d..32986bd 100644 --- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html +++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html @@ -904,7 +904,7 @@ <li> The method must be public. <li> - The parameter and return types must be <a href='../../../../overview-summary.html#Core.PojoCategories'>serializable and parsable</a>. + The parameter and return types must be <a href='../../../../overview-summary.html#juneau-marshall.PojoCategories'>serializable and parsable</a>. </ul> <p> One significant feature is that the remoteable services servlet is a full-blown REST interface. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java index f5c65df..f51bbd3 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java @@ -135,7 +135,7 @@ public class RequestBody { * </table> * * <p> - * Refer to <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a> for + * Refer to <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.PojoCategories">POJO Categories</a> for * a complete definition of supported POJOs. * * <h5 class='section'>Examples:</h5> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java index 30f9d83..d75d605 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java @@ -47,7 +47,7 @@ public interface RestResourceResolver { * @param c The class to resolve. * @param config The initialization configuration for the resource. * @return The instance of that class. - * @throws RestServletException If class could not be resolved. + * @throws Exception If class could not be resolved. */ - Object resolve(Class<?> c, RestConfig config) throws RestServletException; + Object resolve(Class<?> c, RestConfig config) throws Exception; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java index 91bf3eb..e49a4c7 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java @@ -18,7 +18,7 @@ import java.lang.reflect.*; /** * Denotes the default resolver. - * + * * <p> * The default implementation simply instantiates the class using one of the following constructors: * <ul> @@ -43,7 +43,7 @@ import java.lang.reflect.*; public class RestResourceResolverSimple implements RestResourceResolver { @Override /* RestResourceResolver */ - public Object resolve(Class<?> c, RestConfig config) throws RestServletException { + public Object resolve(Class<?> c, RestConfig config) throws Exception { try { Constructor<?> c1 = findPublicConstructor(c, RestConfig.class); if (c1 != null) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java index 817f290..4cb12fc 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java @@ -163,7 +163,7 @@ public final class RestResponse extends HttpServletResponseWrapper { * <li> {@link InputStream} * <li> {@link Reader} * <li> Any serializable type defined in <a class="doclink" - * href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a> + * href="../../../../overview-summary.html#juneau-marshall.PojoCategories">POJO Categories</a> * </ul> * * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html index a3c32f6..344f0db 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html @@ -582,7 +582,7 @@ <h6 class='topic'>Method Return Type</h6> <p> The return type can be any serializable POJO as defined in <a class='doclink' - href='../../../../overview-summary.html#Core.PojoCategories'>POJO Categories</a>. + href='../../../../overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a>. It can also be <jk>void</jk> if the method is not sending any output (e.g. a request redirect) or is setting the output using the {@link org.apache.juneau.rest.RestResponse#setOutput(Object)} method. Calling the {@link org.apache.juneau.rest.RestResponse#setOutput(Object)} method is functionally equivalent @@ -938,7 +938,7 @@ <div class='topic'> <p> Annotations are provided for easy access to HTTP body content as any parsable POJO type - (See <a class='doclink' href='../../../../overview-summary.html#Core.PojoCategories'>POJO Categories</a>). + (See <a class='doclink' href='../../../../overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a>). In the example below, we're POSTing beans. </p> <p class='bcode'> @@ -1631,7 +1631,7 @@ <div class='topic'> <p> The Juneau serializers and parsers are highly-configurable through properties. - (See <a class='doclink' href='../../../../overview-summary.html#Core.ConfigurableProperties'>Configurable Properties</a>) + (See <a class='doclink' href='../../../../overview-summary.html#juneau-marshall.ConfigurableProperties'>Configurable Properties</a>) </p> <p> There are several ways of defining properties in the REST API. @@ -1736,7 +1736,7 @@ <div class='topic'> <p> The Juneau serializers and parsers can be configured on how to handle POJOs through the use of Transforms. - (See <a class='doclink' href='../../../../overview-summary.html#Core.Transforms'>Transforms</a>) + (See <a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Transforms'>Transforms</a>) </p> <p> The {@link org.apache.juneau.rest.annotation.RestResource#beanFilters() @RestResource.beanFilters()} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/package.html index 206cf18..6577c04 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/package.html +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/package.html @@ -120,7 +120,7 @@ <li> The method must be public. <li> - The parameter and return types must be <a href='../../../../../overview-summary.html#Core.PojoCategories'>serializable and parsable</a>. + The parameter and return types must be <a href='../../../../../overview-summary.html#juneau-marshall.PojoCategories'>serializable and parsable</a>. </ul> </div> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html new file mode 100755 index 0000000..536e05a --- /dev/null +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html @@ -0,0 +1,39 @@ +<!-- +/*************************************************************************************************************************** + * 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. + * + ***************************************************************************************************************************/ + --> +<html> +<head> + <style type="text/css"> + /* For viewing in Page Designer */ + @IMPORT url("../../../../../../org.apache.juneau/javadoc.css"); + + /* For viewing in REST interface */ + @IMPORT url("../htdocs/javadoc.css"); + body { + margin: 20px; + } + </style> + <script> + /* Replace all @code and @link tags. */ + window.onload = function() { + document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>'); + document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>'); + } + </script> +</head> +<body> +<p>HTML widget API</p> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/990b5d22/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 976c80b..43e97ea 100644 --- a/pom.xml +++ b/pom.xml @@ -81,6 +81,7 @@ <module>juneau-rest</module> <module>juneau-microservice</module> <module>juneau-examples</module> + <module>juneau-doc</module> <module>juneau-releng</module> </modules> @@ -169,8 +170,8 @@ <linksource>true</linksource> <source>1.6</source> <bootclasspath>${sun.boot.class.path}</bootclasspath> - <overview>${basedir}/juneau-core/juneau-marshall/src/main/javadoc/overview.html</overview> - <stylesheetfile>${basedir}/juneau-core/juneau-marshall/src/main/javadoc/javadoc.css</stylesheetfile> + <overview>${basedir}/juneau-doc/src/main/javadoc/overview.html</overview> + <stylesheetfile>${basedir}/juneau-doc/src/main/javadoc/javadoc.css</stylesheetfile> <use>false</use> <additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none</additionalparam> <verbose>false</verbose> @@ -181,7 +182,7 @@ <link>http://docs.oracle.com/javaee/5/api/</link> </links> <docfilessubdirs>true</docfilessubdirs> - <javadocDirectory>${basedir}/juneau-core/juneau-marshall/src/main/javadoc</javadocDirectory> + <javadocDirectory>${basedir}/juneau-doc/src/main/javadoc</javadocDirectory> </configuration> <executions> <execution>
