Repository: incubator-juneau Updated Branches: refs/heads/master c86ae3943 -> 09d2d0a32
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/resources/xml/testNamespaces.xml ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/resources/xml/testNamespaces.xml b/juneau-core/src/test/resources/xml/testNamespaces.xml index 17026fb..e3b8a77 100755 --- a/juneau-core/src/test/resources/xml/testNamespaces.xml +++ b/juneau-core/src/test/resources/xml/testNamespaces.xml @@ -13,7 +13,7 @@ * specific language governing permissions and limitations under the License. * *************************************************************************************************************************** --> -<object xmlns='http://www.ibm.com' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> +<object xmlns='http://www.apache.org' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <name>John Smith</name> <address _type='object'> <streetAddress>21 2nd Street</streetAddress> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-microservice-template/microservice.cfg ---------------------------------------------------------------------- diff --git a/juneau-microservice-template/microservice.cfg b/juneau-microservice-template/microservice.cfg index 328cfe2..82ac437 100755 --- a/juneau-microservice-template/microservice.cfg +++ b/juneau-microservice-template/microservice.cfg @@ -33,7 +33,7 @@ port = 10000 # A JSON map of servlet paths to servlet classes. # Example: -# resourceMap = {'/*':'com.ibm.MyServlet'} +# resourceMap = {'/*':'com.foo.MyServlet'} # Either resourceMap or resources must be specified if it's not defined in # the manifest file. resourceMap = @@ -42,7 +42,7 @@ resourceMap = # Resource paths are pulled from @RestResource.path() annotation, or # "/*" if annotation not specified. # Example: -# resources = com.ibm.MyServlet +# resources = com.foo.MyServlet # Default is Rest-Resources in manifest file. # Either resourceMap or resources must be specified if it's not defined in # the manifest file. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java index ed1cc4c..b0d8e12 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java @@ -386,7 +386,7 @@ public class RestMicroservice extends Microservice { * * <cc># A JSON map of servlet paths to servlet classes. * # Example: - * # resourceMap = {'/*':'com.ibm.MyServlet'} + * # resourceMap = {'/*':'com.foo.MyServlet'} * # Either resourceMap or resources must be specified if it's not defined in * # the manifest file.</cc> * <ck>resourceMap</ck> = @@ -395,7 +395,7 @@ public class RestMicroservice extends Microservice { * # Resource paths are pulled from @RestResource.path() annotation, or * # "/*" if annotation not specified. * # Example: - * # resources = com.ibm.MyServlet + * # resources = com.foo.MyServlet * * # Default is Rest-Resources in manifest file. * # Either resourceMap or resources must be specified if it's not defined in * # the manifest file.</cc> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html b/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html index 6ab0126..d6eb2ba 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html @@ -371,7 +371,7 @@ <cc># A JSON map of servlet paths to servlet classes. # Example: - # resourceMap = {'/*':'com.ibm.MyServlet'} + # resourceMap = {'/*':'com.foo.MyServlet'} # Either resourceMap or resources must be specified.</cc> <ck>resourceMap</ck> = @@ -379,7 +379,7 @@ # Resource paths are pulled from @RestResource.path() annotation, or # "/*" if annotation not specified. # Example: - # resources = com.ibm.MyServlet + # resources = com.foo.MyServlet # Default is Rest-Resources in manifest file. # Either resourceMap or resources must be specified.</cc> <ck>resources</ck> = @@ -838,13 +838,13 @@ <p> This example shows how the {@link org.apache.juneau.microservice.RestMicroservice} class can be extended to implement lifecycle listener methods or override existing methods. - We'll create a new class <l>com.ibm.SampleCustomRestMicroservice</l>. + We'll create a new class <l>com.foo.SampleCustomRestMicroservice</l>. </p> <p> First, the manifest file needs to be modified to point to our new microservice: </p> <p class='bcode'> - <mk>Main-Class:</mk> com.ibm.SampleCustomRestMicroservice + <mk>Main-Class:</mk> com.foo.SampleCustomRestMicroservice </p> <p> Then we define the following class: http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-releng/build.xml ---------------------------------------------------------------------- diff --git a/juneau-releng/build.xml b/juneau-releng/build.xml deleted file mode 100755 index 95863e6..0000000 --- a/juneau-releng/build.xml +++ /dev/null @@ -1,519 +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. * - *************************************************************************************************************************** ---> -<project name='Juneau' xmlns:jacoco='antlib:org.jacoco.ant' default='Juneau.Build'> - - <taskdef - uri='antlib:org.jacoco.ant' - resource='org/jacoco/ant/antlib.xml' - classpath='lib/jacoco/jacocoant.jar'/> - - <!-- ================================================================================ --> - <!-- Common initialization --> - <!-- ================================================================================ --> - <target name='Juneau.Init'> - <tstamp/> - <loadproperties srcFile='build.properties'/> - - <!-- Additional classpath --> - <path id='classpath'> - <pathelement path='../org.apache.juneau.releng/lib/jena/jena-core-2.7.1.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/mail.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/httpclient/httpclient-4.5.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/httpclient/httpcore-4.4.1.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/httpclient/httpmime-4.5.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/javax.servlet_2.5.0.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/jaxrs/jsr311-api-1.1.1.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/equinox/org.eclipse.osgi_3.6.50.R36x_v20120315-1500.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/equinox/org.eclipse.osgi.services_3.2.100.v20100503.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/junit/junit-4.12.jar'/> - <pathelement path='../org.apache.juneau.releng/lib/commons-fileupload/org.apache.commons.fileupload_1.3.1.jar'/> - - <!-- Microservice jar --> - <pathelement path='../org.apache.juneau.microservice/lib/jetty-all-8.1.0.jar'/> - </path> - </target> - - <!-- ================================================================================ --> - <!-- Build --> - <!-- ================================================================================ --> - <target name='Juneau.Build' depends='Juneau.Init' description='Creates a new release of the product.'> - <delete dir='build' quiet='true'/> - <mkdir dir='build'/> - <antcall target='Juneau.BuildJars'/> - <antcall target='Juneau.ComponentTest'/> - <antcall target='Juneau.BuildDoc'/> - <antcall target='Juneau.BuildDocZip'/> - </target> - - <!-- ================================================================================ --> - <!-- Build the jar files --> - <!-- ================================================================================ --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <target name='Juneau.BuildJars' depends='Juneau.Init' description='Build jar files.'> - - <delete dir='bin' quiet='true'/> - <delete dir='build' quiet='true'/> - - <mkdir dir='bin/core'/> - <mkdir dir='bin/server'/> - <mkdir dir='bin/client'/> - <mkdir dir='bin/microservice'/> - <mkdir dir='bin/source'/> - <mkdir dir='bin/all/META-INF'/> - - <mkdir dir='bin/samples'/> - <mkdir dir='bin/core.test'/> - <mkdir dir='bin/server.test'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-core.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Compiling org.apache.juneau_${version}.jar ***'/> - - <copy todir='bin/core'> - <fileset dir='../org.apache.juneau/src/main/java' includes='**/*.properties'/> - <fileset dir='../org.apache.juneau' includes='META-INF/*'/> - </copy> - <javac destdir='bin/core' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false'> - <classpath refid='classpath'/> - <src path='../org.apache.juneau/src/main/java'/> - </javac> - <manifest file='bin/core/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar jarfile='${dir.build}/org.apache.juneau_${version}.jar' basedir='bin/core' duplicate='fail' level='9' excludes='**/proto/**' manifest='bin/core/META-INF/MANIFEST.MF'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-server.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Compiling org.apache.juneau.server_${version}.jar ***'/> - - <copy todir='bin/server'> - <fileset dir='../org.apache.juneau.server/src/main/java' includes='**/*.properties,**/*.css,**/*.ico,com/ibm/team/juneau/server/htdocs/*'/> - <fileset dir='../org.apache.juneau.server' includes='META-INF/*'/> - </copy> - <javac destdir='bin/server' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false'> - <classpath refid='classpath'/> - <classpath path='bin/core'/> - <src path='../org.apache.juneau.server/src/main/java'/> - </javac> - <manifest file='bin/server/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar jarfile='${dir.build}/org.apache.juneau.server_${version}.jar' basedir='bin/server' duplicate='fail' level='9' excludes='**/proto/**' manifest='bin/server/META-INF/MANIFEST.MF'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-client.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** org.apache.juneau.client_${version}.jar ***'/> - - <copy todir='bin/client'> - <fileset dir='../org.apache.juneau.client/src/main/java' includes='**/*.properties'/> - <fileset dir='../org.apache.juneau.client' includes='META-INF/*'/> - </copy> - <javac destdir='bin/client' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false'> - <classpath refid='classpath'/> - <classpath path='bin/core'/> - <src path='../org.apache.juneau.client/src/main/java'/> - </javac> - <manifest file='bin/client/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar jarfile='${dir.build}/org.apache.juneau.client_${version}.jar' basedir='bin/client' duplicate='fail' level='9' excludes='**/proto/**' manifest='bin/client/META-INF/MANIFEST.MF'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-microservice.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Compiling org.apache.juneau.microservice_${version}.jar ***'/> - - <copy todir='bin/microservice'> - <fileset dir='../org.apache.juneau.microservice/src/main/java' includes='**/*.properties,org/apache/juneau/microservice/resources/*.html'/> - <fileset dir='../org.apache.juneau.microservice' includes='META-INF/*'/> - </copy> - <javac destdir='bin/microservice' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false'> - <classpath refid='classpath'/> - <classpath path='bin/core'/> - <classpath path='bin/server'/> - <classpath path='bin/client'/> - <src path='../org.apache.juneau.microservice/src/main/java'/> - </javac> - <manifest file='bin/microservice/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar jarfile='${dir.build}/org.apache.juneau.microservice_${version}.jar' basedir='bin/microservice' duplicate='fail' level='9' excludes='**/proto/**' manifest='bin/microservice/META-INF/MANIFEST.MF'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-all.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building juneau-all-${version}.jar ***'/> - - <manifest file='bin/all/META-INF/MANIFEST.MF'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Name' value='Apache Juneau'/> - <attribute name='Bundle-Vendor' value='Apache Software Foundation, Juneau'/> - <attribute name='Bundle-SymbolicName' value='org.apache.juneau.all'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar destfile='${dir.build}/juneau-all-${version}.jar' excludes='META-INF/*' manifest='bin/all/META-INF/MANIFEST.MF'> - <zipgroupfileset dir='${dir.build}' includes="org.apache.juneau_${version}.jar,org.apache.juneau.server_${version}.jar,org.apache.juneau.client_${version}.jar,org.apache.juneau.microservice_${version}.jar"/> - </jar> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-all_src.zip --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building juneau-all-${version}_src.zip ***'/> - - <zip destfile='${dir.build}/juneau-all-${version}_src.zip'> - <fileset dir="../org.apache.juneau/src/main/java"/> - <fileset dir="../org.apache.juneau.server/src/main/java"/> - <fileset dir="../org.apache.juneau.client/src/main/java"/> - <fileset dir="../org.apache.juneau.microservice/src/main/java"/> - </zip> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-samples.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building juneau-samples-${version}.jar ***'/> - - <copy todir='bin/samples'> - <fileset dir='../org.apache.juneau.samples/src/main/java' includes='**/*'/> - <fileset dir='../org.apache.juneau.samples' includes='META-INF/*'/> - </copy> - <javac destdir='bin/samples' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false'> - <classpath refid='classpath'/> - <classpath path='bin/core'/> - <classpath path='bin/server'/> - <classpath path='bin/client'/> - <classpath path='bin/microservice'/> - <src path='../org.apache.juneau.samples/src/main/java'/> - </javac> - <manifest file='bin/samples/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar jarfile='${dir.build}/juneau-samples-${version}.jar' basedir='bin/samples' duplicate='fail' level='9' excludes='**/proto/**' manifest='bin/samples/META-INF/MANIFEST.MF'/> - - <jar jarfile='${dir.build}/juneau-samples-fat-${version}.jar' manifest="bin/samples/META-INF/MANIFEST.MF"> - <zipgroupfileset dir='${dir.build}' includes='juneau-all-${version}.jar,juneau-samples-${version}.jar'/> - <zipgroupfileset dir='../org.apache.juneau.microservice/lib' includes='*.jar'/> - <zipgroupfileset dir='lib/jena' includes='*.jar'/> - <zipgroupfileset dir='lib/derby' includes='*.jar'/> - </jar> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-core-test.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building juneau-core-test-${version}.jar ***'/> - <copy todir='bin/core.test'> - <fileset dir='../org.apache.juneau/src/test/java' excludes='**/*.java'/> - <fileset dir='../org.apache.juneau' includes='META-INF/*'/> - </copy> - <javac destdir='bin/core.test' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false' encoding='UTF-8'> - <classpath refid='classpath'/> - <classpath> - <fileset dir='${dir.build}' includes='**/*.jar'/> - </classpath> - <src path='../org.apache.juneau/src/test/java'/> - </javac> - <manifest file='bin/core.test/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar jarfile='${dir.build}/juneau-core-test-${version}.jar' basedir='bin/core.test' duplicate='fail' level='9' excludes='**/proto/**' manifest='bin/core.test/META-INF/MANIFEST.MF'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau-server-test.jar --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building juneau-server-test-${version}.jar ***'/> - - <copy todir='bin/server.test'> - <fileset dir='../org.apache.juneau.server.test/src/main/java' excludes='**/*.java'/> - <fileset dir='../org.apache.juneau.server.test/src/test/java' excludes='**/*.java'/> - <fileset dir='../org.apache.juneau.server.test' includes='META-INF/*'/> - </copy> - <javac destdir='bin/server.test' fork='true' source='1.6' target='1.6' debug='true' includeantruntime='false' encoding='UTF-8'> - <classpath refid='classpath'/> - <classpath> - <fileset dir='../org.apache.juneau.microservice/lib' includes='**/*.jar'/> - <fileset dir='${dir.build}' includes='**/*.jar'/> - </classpath> - <src path='../org.apache.juneau.server.test/src/main/java'/> - <src path='../org.apache.juneau.server.test/src/test/java'/> - </javac> - <manifest file='bin/server.test/META-INF/MANIFEST.MF' mode='update'> - <attribute name='Built-By' value='${user.name}'/> - <attribute name='Build-Date' value='${TODAY}'/> - <attribute name='Bundle-Version' value='${version}'/> - </manifest> - - <jar destfile='${dir.build}/juneau-server-test-${version}.jar' basedir='bin/server.test' excludes='META-INF/*' manifest='bin/server.test/META-INF/MANIFEST.MF'> - <zipgroupfileset dir='${dir.build}' includes='juneau-samples-fat-${version}.jar'/> - </jar> - - <copy file='../org.apache.juneau.server.test/juneau-server-test.cfg' todir='${dir.build}/test'/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- juneau.war --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building juneau-samples-${version}.war ***'/> - <war destfile='${dir.build}/juneau-samples-${version}.war' webxml='../org.apache.juneau.samples/war/web.xml'> - <lib dir='lib/commons-codec-1.9'/> - <lib dir='lib/derby'/> - <lib dir='lib/httpclient' includes='*.jar'/> - <lib dir='lib/jaxrs'/> - <lib dir='lib/jena'/> - <lib dir='${dir.build}' includes='juneau-samples-${version}.jar,juneau-all-${version}.jar'/> - </war> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- org.apache.juneau.microservice.template.zip --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building org.apache.juneau.microservice.template-${version}.zip ***'/> - <mkdir dir="${dir.build}/org.apache.juneau.microservice.template"/> - <copy todir='${dir.build}/org.apache.juneau.microservice.template'> - <fileset dir='../org.apache.juneau.microservice.template' excludes='target/**'/> - </copy> - <copy todir='${dir.build}/org.apache.juneau.microservice.template/lib'> - <fileset dir='${dir.build}' includes='juneau-all-${version}.jar'/> - <fileset dir='../org.apache.juneau.microservice/lib' includes='*.jar'/> - </copy> - <zip basedir='${dir.build}' includes='org.apache.juneau.microservice.template/**' destfile='${dir.build}/org.apache.juneau.microservice.template-${version}.zip'/> - <delete dir="${dir.build}/org.apache.juneau.microservice.template"/> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- org.apache.juneau.samples.zip --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <echo message='*** Building org.apache.juneau.samples-${version}.zip ***'/> - <mkdir dir="${dir.build}/org.apache.juneau.samples"/> - <copy todir='${dir.build}/org.apache.juneau.samples'> - <fileset dir='../org.apache.juneau.samples' excludes='target/**'/> - </copy> - <copy todir='${dir.build}/org.apache.juneau.samples/lib'> - <fileset dir='${dir.build}' includes='juneau-all-${version}.jar'/> - <fileset dir='../org.apache.juneau.microservice/lib' includes='*.jar'/> - </copy> - <zip basedir='${dir.build}' includes='org.apache.juneau.samples/**' destfile='${dir.build}/org.apache.juneau.samples-${version}.zip'/> - <delete dir="${dir.build}/org.apache.juneau.samples"/> - </target> - - <!-- ================================================================================ --> - <!-- Component tests --> - <!-- ================================================================================ --> - <target name='Juneau.ComponentTest' depends='Juneau.Init' description='Run JUnit component tests.'> - - <delete dir='${dir.build}/test/junit' failonerror='false'/> - <delete dir='${dir.build}/test/jacoco' failonerror='false'/> - - <mkdir dir='${dir.build}/test/junit/results'/> - <mkdir dir='${dir.build}/test/junit/html'/> - - <echo message='*** Starting juneau-samples microservice ***'/> - <jacoco:coverage destfile='${dir.build}/test/jacoco/jacoco2.exec' includes='org.apache.juneau.*'> - <java jar='${dir.build}/juneau-samples-fat-${version}.jar' dir='${dir.build}' fork='true' spawn='true'/> - </jacoco:coverage> - - <echo message='*** Starting juneau-server-test microservice ***'/> - <jacoco:coverage destfile='${dir.build}/test/jacoco/jacoco3.exec' includes='org.apache.juneau.*'> - <java jar='${dir.build}/juneau-server-test-${version}.jar' dir='${dir.build}/test' fork='true' spawn='true'/> - </jacoco:coverage> - - <echo message='*** Running component tests ***'/> - <jacoco:coverage destfile='${dir.build}/test/jacoco/jacoco.exec' includes='org.apache.juneau.*'> - - <!-- Run from project dir. Fork=true required for dir attr. --> - <junit printsummary='true' showoutput='true' fork='true' includeAntRuntime='true' failureproperty='TestFailed' forkmode='once'> - <sysproperty key='JUNO_SAMPLE_URL' value='http://localhost:10000'/> - <sysproperty key='JUNO_SERVER_TEST_URL' value='http://localhost:10001'/> - <classpath> - <fileset dir='lib'> - <include name='**/*.jar' /> - </fileset> - <fileset dir='build'> - <include name='**/*.jar' /> - </fileset> - </classpath> - <batchtest todir='${dir.build}/test/junit/results' filtertrace='false'> - <fileset dir='../org.apache.juneau/src/test/java'> - <include name='**/CT_*.java' /> - </fileset> - <fileset dir='../org.apache.juneau.server.test/src/test/java'> - <include name='**/CT_*.java' /> - </fileset> - <formatter type='xml'/> - </batchtest> - </junit> - - </jacoco:coverage> - - <!-- Create the JUnit report file --> - <delete dir='${dir.build}/test/junit/html' failonerror='false' /> - <mkdir dir='${dir.build}/test/junit/html' /> - <!-- Commented out for now due to bug https://issues.apache.org/bugzilla/show_bug.cgi?id=51668 --> - <junitreport> - <fileset dir='${dir.build}/test/junit/results'> - <include name='**/TEST-*.xml' /> - </fileset> - <report format='noframes' todir='${dir.build}/test/junit/html'/> - </junitreport> - - <echo message='*** Stopping juneau-samples microservice ***'/> - <get src='http://127.0.0.1:10000/shutdown' dest='out.html' ignoreerrors='true'/> - - <echo message='*** Stopping juneau-server-test microservice ***'/> - <get src='http://127.0.0.1:10001/shutdown' dest='out.html' ignoreerrors='true'/> - - <jacoco:report> - <executiondata> - <!--file file='${dir.build}/test/jacoco/jacoco.exec' /--> - <file file='${dir.build}/test/jacoco/jacoco2.exec' /> - <file file='${dir.build}/test/jacoco/jacoco3.exec' /> - </executiondata> - <structure name='Juneau'> - <group name='Core'> - <classfiles> - <fileset dir='${dir.build}' includes='juneau-core.jar'/> - </classfiles> - <sourcefiles encoding='UTF-8'> - <fileset dir='../org.apache.juneau/src/main/java' /> - </sourcefiles> - </group> - <group name='Server'> - <classfiles> - <fileset dir='${dir.build}' includes='juneau-server.jar'/> - </classfiles> - <sourcefiles encoding='UTF-8'> - <fileset dir='../org.apache.juneau.server/src/main/java' /> - </sourcefiles> - </group> - <group name='Client'> - <classfiles> - <fileset dir='${dir.build}' includes='juneau-client.jar'/> - </classfiles> - <sourcefiles encoding='UTF-8'> - <fileset dir='../org.apache.juneau.client/src/main/java' /> - </sourcefiles> - </group> - </structure> - <!-- to produce reports in different formats. --> - <html destdir='${dir.build}/test/jacoco/results' /> - <csv destfile='${dir.build}/test/jacoco/results/report.csv' /> - <xml destfile='${dir.build}/test/jacoco/results/report.xml' /> - </jacoco:report> - - <ant target='Juneau.CtFailed'/> - <ant target='Juneau.CtSucceeded'/> - </target> - - <target name='Juneau.CtFailed' if='TestFailed'> - <echo message='Juneau component testsuite run had at least one failure.'/> - </target> - - <target name='Juneau.CtSucceeded' unless='TestFailed'> - <echo message='Juneau component testsuite run succeeded.'/> - </target> - - - <!-- ================================================================================ --> - <!-- Build Javadocs --> - <!-- ================================================================================ --> - <target name='Juneau.BuildDoc' depends='Juneau.Init' unless='Juneau.BuildDoc.Executed'> - <!--delete dir='doc'/--> - <echo message="Building Javadocs at ${dir.build}/javadoc"/> - <javadoc - access='protected' - windowtitle='Juneau' - author='true' - destdir='${dir.build}/javadoc' - linksource='on' - source='1.6' - overview='../org.apache.juneau/src/main/java/overview.html' - stylesheetfile='javadoc.css' - use='true' - additionalparam='-sourcetab 3 -notimestamp -Xdoclint:none' - verbose='false' - excludepackagenames='*proto*'> - <link href='http://docs.oracle.com/javase/7/docs/api/' /> - <link href='http://docs.oracle.com/javaee/5/api/' /> - <packageset dir='../org.apache.juneau/src/main/java'> - <include name='org/apache/juneau/**'/> - <exclude name='**/proto/**'/> - <exclude name='**/internal/**'/> - </packageset> - <packageset dir='../org.apache.juneau.client/src/main/java'> - <include name='org/apache/juneau/**'/> - <exclude name='**/proto/**'/> - </packageset> - <packageset dir='../org.apache.juneau.server/src/main/java'> - <include name='org/apache/juneau/**'/> - <exclude name='**/proto/**'/> - </packageset> - <packageset dir='../org.apache.juneau.microservice/src/main/java'> - <include name='org/apache/juneau/**'/> - <exclude name='**/proto/**'/> - </packageset> - <classpath refid='classpath'/> - <group title='org.apache.juneau - Core API (serializers, parsers, bean context)'> - <package name='org.apache.juneau*'/> - </group> - <group title='org.apache.juneau.server - REST Server API'> - <package name='org.apache.juneau.server*'/> - </group> - <group title='org.apache.juneau.client - REST Client API'> - <package name='org.apache.juneau.client*'/> - </group> - <group title='org.apache.juneau.microservice - Microservice API'> - <package name='org.apache.juneau.microservice*'/> - </group> - </javadoc> - <!--java classname='org.apache.juneau.utils.LinkValidator' classpath='../org.apache.juneau.utils/bin;bin' dir='.' fork='true'> - <arg value='doc'/> - </java--> - - <property name='Juneau.BuildDoc.Executed' value='true'/> - </target> - - - <!-- ================================================================================ --> - <!-- Build Javadoc zip file --> - <!-- ================================================================================ --> - <target name='Juneau.BuildDocZip' description='Create Javadoc archive file' depends='Juneau.BuildDoc'> - - <!-- juneau_javadocs.war --> - <echo message='*** Building juneau-javadocs-${version}.war ***'/> - <war destfile='${dir.build}/juneau-javadocs-${version}.war' webxml='misc/web.xml'> - <fileset dir='${dir.build}/javadoc'/> - </war> - - </target> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-samples/samples.cfg ---------------------------------------------------------------------- diff --git a/juneau-samples/samples.cfg b/juneau-samples/samples.cfg index 00a3bbf..fff2f48 100755 --- a/juneau-samples/samples.cfg +++ b/juneau-samples/samples.cfg @@ -131,7 +131,7 @@ org.eclipse.jetty.LEVEL = WARN # DockerRegistryResource properties #================================================================================ [DockerRegistry] -url = http://clmdocker02.ratl.swg.usma.ibm.com:5000/v1 +url = http://docker.apache.org:5000/v1 #================================================================================ # SqlQueryResource properties http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/package-info.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/package-info.java b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/package-info.java index c1303b4..b84ad3a 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/package-info.java +++ b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/package-info.java @@ -14,19 +14,19 @@ @XmlSchema( prefix="ab", xmlNs={ - @XmlNs(prefix="ab", namespaceURI="http://www.ibm.com/addressBook/";), - @XmlNs(prefix="per", namespaceURI="http://www.ibm.com/person/";), - @XmlNs(prefix="addr", namespaceURI="http://www.ibm.com/address/";), - @XmlNs(prefix="mail", namespaceURI="http://www.ibm.com/mail/";) + @XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/";), + @XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/";), + @XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/";), + @XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/";) } ) @RdfSchema( prefix="ab", rdfNs={ - @RdfNs(prefix="ab", namespaceURI="http://www.ibm.com/addressBook/";), - @RdfNs(prefix="per", namespaceURI="http://www.ibm.com/person/";), - @RdfNs(prefix="addr", namespaceURI="http://www.ibm.com/address/";), - @RdfNs(prefix="mail", namespaceURI="http://www.ibm.com/mail/";) + @RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/";), + @RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/";), + @RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/";), + @RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/";) } ) package org.apache.juneau.samples.addressbook; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java b/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java index dbf2357..6343047 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java +++ b/juneau-samples/src/main/java/org/apache/juneau/server/samples/AtomFeedResource.java @@ -57,8 +57,8 @@ public class AtomFeedResource extends ResourceJena { new Link("alternate", "text/html", "http://www.sample.com/";).setHreflang("en"), new Link("self", "application/atom+xml", "http://www.sample.com/feed.atom";) ) - .setRights(new Text("Copyright (c) 2013, IBM")) - .setGenerator(new Generator("Juneau").setUri(new URI("http://juneau.ibm.com/";)).setVersion("1.0")) + .setRights(new Text("Copyright (c) 2016, Apache Foundation")) + .setGenerator(new Generator("Juneau").setUri(new URI("http://juneau.apache.org/";)).setVersion("1.0")) .addEntries( new Entry() .setTitle(new Text("Juneau ATOM specification snapshot")) @@ -76,7 +76,7 @@ public class AtomFeedResource extends ResourceJena { .setContent( new Content() .setLang("en") - .setBase(new URI("http://www.ibm.com/";)) + .setBase(new URI("http://www.apache.org/";)) .setType("xhtml") .setText("<div xmlns=\"http://www.w3.org/1999/xhtml\";><p><i>[Update: Juneau supports ATOM.]</i></p></div>") ) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-samples/src/main/resources/samples.cfg ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/resources/samples.cfg b/juneau-samples/src/main/resources/samples.cfg index 9e6a066..758e6b8 100755 --- a/juneau-samples/src/main/resources/samples.cfg +++ b/juneau-samples/src/main/resources/samples.cfg @@ -129,7 +129,7 @@ org.eclipse.jetty.LEVEL = WARN # DockerRegistryResource properties #================================================================================ [DockerRegistry] -url = http://clmdocker02.ratl.swg.usma.ibm.com:5000/v1 +url = http://docker.apache.org:5000/v1 #================================================================================ # SqlQueryResource properties http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-server-test/.settings/org.eclipse.jdt.ui.prefs ---------------------------------------------------------------------- diff --git a/juneau-server-test/.settings/org.eclipse.jdt.ui.prefs b/juneau-server-test/.settings/org.eclipse.jdt.ui.prefs index 6bb6ddb..ed2ad3d 100755 --- a/juneau-server-test/.settings/org.eclipse.jdt.ui.prefs +++ b/juneau-server-test/.settings/org.eclipse.jdt.ui.prefs @@ -128,7 +128,6 @@ sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false -sp_cleanup.update_ibm_copyright_to_current_year=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_parentheses_in_expressions=false http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-server-test/juneau-server-test.cfg ---------------------------------------------------------------------- diff --git a/juneau-server-test/juneau-server-test.cfg b/juneau-server-test/juneau-server-test.cfg index 48bb13c..2b79931 100755 --- a/juneau-server-test/juneau-server-test.cfg +++ b/juneau-server-test/juneau-server-test.cfg @@ -95,7 +95,7 @@ format = [{date} {level}] {msg}%n append = false limit = 10M count = 5 -levels = { com.ibm.team:'INFO' } +levels = { com.foo.team:'INFO' } useStackTraceHashes = true consoleLevel = WARNING http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-server/.settings/org.eclipse.jdt.ui.prefs ---------------------------------------------------------------------- diff --git a/juneau-server/.settings/org.eclipse.jdt.ui.prefs b/juneau-server/.settings/org.eclipse.jdt.ui.prefs index 18a1f0f..b892662 100755 --- a/juneau-server/.settings/org.eclipse.jdt.ui.prefs +++ b/juneau-server/.settings/org.eclipse.jdt.ui.prefs @@ -128,7 +128,6 @@ sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false -sp_cleanup.update_ibm_copyright_to_current_year=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_parentheses_in_expressions=false http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-server/src/main/java/org/apache/juneau/server/annotation/RestResource.java ---------------------------------------------------------------------- diff --git a/juneau-server/src/main/java/org/apache/juneau/server/annotation/RestResource.java b/juneau-server/src/main/java/org/apache/juneau/server/annotation/RestResource.java index e878de2..6a61f03 100755 --- a/juneau-server/src/main/java/org/apache/juneau/server/annotation/RestResource.java +++ b/juneau-server/src/main/java/org/apache/juneau/server/annotation/RestResource.java @@ -57,8 +57,8 @@ public @interface RestResource { * used in the properties file. * <p> * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the - * resource bundle <js>"com.ibm.sample.nls.Messages"</js> if the resource class - * is in <js>"com.ibm.sample"</js>, or it can be an absolute path, like <js>"com.ibm.sample.nls.Messages"</js> + * resource bundle <js>"com.foo.sample.nls.Messages"</js> if the resource class + * is in <js>"com.foo.sample"</js>, or it can be an absolute path, like <js>"com.foo.sample.nls.Messages"</js> */ String messages() default ""; @@ -500,7 +500,7 @@ public @interface RestResource { * * <h6 class='topic'>Example:</h6> * <p class='bcode'> - * <jk>package</jk> com.ibm.mypackage; + * <jk>package</jk> com.foo.mypackage; * * <ja>@RestResource</ja>( * stylesheet=<js>"mystyles/mycss.css"</js> @@ -512,7 +512,7 @@ public @interface RestResource { * In this example, the servlet will attempt to find the <code>mycss.css</code> file in the following ordered locations: * </p> * <ol> - * <li><code>com.ibm.mypackage.mystyles</code> package. + * <li><code>com.foo.mypackage.mystyles</code> package. * <li><code>org.apache.juneau.server.mystyles</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.server</code>). * <li><code>[working-dir]/mystyles</code> directory. * </ol> @@ -530,7 +530,7 @@ public @interface RestResource { * * <h6 class='topic'>Example:</h6> * <p class='bcode'> - * <jk>package</jk> com.ibm.mypackage; + * <jk>package</jk> com.foo.mypackage; * * <ja>@RestResource</ja>( * favicon=<js>"mydocs/myicon.ico"</js> @@ -542,7 +542,7 @@ public @interface RestResource { * In this example, the servlet will attempt to find the <code>myicon.ico</code> file in the following ordered locations: * </p> * <ol> - * <li><code>com.ibm.mypackage.mydocs</code> package. + * <li><code>com.foo.mypackage.mydocs</code> package. * <li><code>org.apache.juneau.server.mydocs</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.server</code>). * <li><code>[working-dir]/mydocs</code> directory. * </ol> @@ -562,7 +562,7 @@ public @interface RestResource { * * <h6 class='topic'>Example:</h6> * <p class='bcode'> - * <jk>package</jk> com.ibm.mypackage; + * <jk>package</jk> com.foo.mypackage; * * <ja>@RestResource</ja>( * path=<js>"/myresource"</js>, @@ -576,7 +576,7 @@ public @interface RestResource { * in the following ordered locations: * </p> * <ol> - * <li><code>com.ibm.mypackage.docs</code> package. + * <li><code>com.foo.mypackage.docs</code> package. * <li><code>org.apache.juneau.server.docs</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.server</code>). * <li><code>[working-dir]/docs</code> directory. * </ol> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html ---------------------------------------------------------------------- diff --git a/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html b/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html index b906649..e6d8ea8 100755 --- a/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html +++ b/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html @@ -150,7 +150,7 @@ </p> <p class='bcode'> org.apache.juneau.server.jaxrs.DefaultProvider - com.ibm.sample.jaxrs.HelloWorldResource + com.foo.sample.jaxrs.HelloWorldResource </p> <p> Interestingly, the <code>DefaultProvider</code> itself is a subclass of <code>BaseProvider</code> @@ -326,7 +326,7 @@ <p class='bcode'> C:\>curl.exe -H "Accept: application/x-java-serialized-object" -X GET http://localhost:9080/sample/wink/helloworld <ja>detailMessaget âLjava/lang/String;[ ption(Vx ÏÃ¥â¬5â» xr âjava.io.ObjectStreamExceptiondâΣkì9âââ» xr â¼java.io.IOExcept - stackTracet â²[Ljava/lang/StackTraceElement;xpq t /com.ibm.sample.jaxrs.HelloWorldResource$Messageur â²[Ljava.lang.Sta + stackTracet â²[Ljava/lang/StackTraceElement;xpq t /org.apache.juneau.samples.jaxrs.HelloWorldResource$Messageur â²[Ljava.lang.Sta lineNumberL â«declaringClassq ~ â LfileNameq ~ â L methodNameq ~ â xp â¦Ã¡t âjava.io.ObjectOutputStreamt â¨ObjectOutputStream.javat âwriteObject0sq ~ â âº[t âjava.io.Obje 3org.apache.juneau.serializer.OutputStreamSerializert âOutputStreamSerializer.javat serializesq ~ â ^t &com.ib @@ -342,7 +342,7 @@ nnectionInitialReadCallback.javat ¶sendToDiscriminatorssq ~ â qt <com.ibm.ws.tcp.channel.impl.NewConnectionInitial ât $com.ibm.io.async.AbstractAsyncFuturet âAbstractAsyncFuture.javat â«invokeCallbacksq ~ â Ãt #com.ibm.io.async. t âResultHandler.javatcompletesq ~ â â¥t â²com.ibm.io.async.ResultHandlert âResultHandler.javat â¬runEventProcessingLo - on: java.io.NotSerializableException: com.ibm.sample.jaxrs.HelloWorldResource$Message</ja> + on: java.io.NotSerializableException: org.apache.juneau.samples.jaxrs.HelloWorldResource$Message</ja> </p> <p> The following shows the PUT method being invoked. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-server/src/main/java/org/apache/juneau/server/package.html ---------------------------------------------------------------------- diff --git a/juneau-server/src/main/java/org/apache/juneau/server/package.html b/juneau-server/src/main/java/org/apache/juneau/server/package.html index 5d99cf9..31e7e92 100755 --- a/juneau-server/src/main/java/org/apache/juneau/server/package.html +++ b/juneau-server/src/main/java/org/apache/juneau/server/package.html @@ -209,7 +209,7 @@ <xt><web-app</xt> <xa>version</xa>=<xs>"2.3"</xs><xt>></xt> <xt><servlet></xt> <xt><servlet-name></xt>HelloWorldResource<xt></servlet-name></xt> - <xt><servlet-class></xt>com.ibm.sample.HelloWorldResource<xt></servlet-class></xt> + <xt><servlet-class></xt>com.foo.sample.HelloWorldResource<xt></servlet-class></xt> <xt></servlet></xt> <xt><servlet-mapping></xt> <xt><servlet-name></xt>HelloWorldResource<xt></servlet-name></xt> @@ -351,12 +351,6 @@ <li class='a'>{@link org.apache.juneau.server.jena.RestServletJenaGroupDefault org.apache.juneau.server.jena.RestServletJenaGroupDefault} <br>Same as {@link org.apache.juneau.server.RestServletGroupDefault}, but adds RDF support. </ul> - <li class='a'><code>com.ibm.team.repository.service.JazzRestResource</code> - <br>Parent class in Jazz Foundation for REST-based services. - <ul> - <li class='a'><code>com.ibm.team.repository.service.JazzDefaultRestResource</code> - <br>Provides a default set of serializers, parsers, options page, stylesheet, and other common settings. - </ul> </ul> </ul> </ul> @@ -2230,7 +2224,7 @@ </p> <h6 class='figure'>Example:</h6> <p class='bcode'> - <jk>package</jk> com.ibm.mypackage; + <jk>package</jk> com.foo.mypackage; <ja>@RestResource</ja>( path=<js>"/myresource"</js>, @@ -2248,7 +2242,7 @@ in the following ordered locations: </p> <ol> - <li><l>com.ibm.mypackage.docs</l> package. + <li><l>com.foo.mypackage.docs</l> package. <li><l>org.apache.juneau.server.docs</l> package (since <l>RestServletDefault</l> is in <l>org.apache.juneau.server</l>). <li><l>[working-dir]/docs</l> directory. </ol> @@ -2320,7 +2314,7 @@ Custom stylesheets can be defined by specifying your own stylesheet annotation value: </p> <p class='bcode'> - <jk>package</jk> com.ibm.mypackage; + <jk>package</jk> com.foo.mypackage; <ja>@RestResource</ja>( stylesheet=<js>"mystyles/mycss.css"</js> ) @@ -2331,7 +2325,7 @@ In this example, the servlet will attempt to find the <l>mycss.css</l> file in the following ordered locations: </p> <ol> - <li><l>com.ibm.mypackage.mystyles</l> package. + <li><l>com.foo.mypackage.mystyles</l> package. <li><l>org.apache.juneau.server.mystyles</l> package (since <l>RestServletDefault</l> is in <l>org.apache.juneau.server</l>). <li><l>[working-dir]/mystyles</l> directory. </ol>
