You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by sc...@apache.org on 2005/06/20 17:18:41 UTC

svn commit: r191489 - in /incubator/apollo/trunk: ./ commonj-twm/ jndi-config/ maven-plugins/maven-ajar-plugin/ src/java/org/apache/ws/resource/impl/ src/java/org/apache/ws/resource/tool/ src/site/ src/site/content/example/ src/site/content/tutorial/ s...

Author: scamp
Date: Mon Jun 20 08:18:38 2005
New Revision: 191489

URL: http://svn.apache.org/viewcvs?rev=191489&view=rev
Log:
changes made for renaming of the projects out of incubation.

Modified:
    incubator/apollo/trunk/BUILD.txt
    incubator/apollo/trunk/README.html
    incubator/apollo/trunk/build.properties.sample
    incubator/apollo/trunk/commonj-twm/project.xml
    incubator/apollo/trunk/cutting_releases.txt
    incubator/apollo/trunk/forrest.properties
    incubator/apollo/trunk/jndi-config/project.xml
    incubator/apollo/trunk/maven-plugins/maven-ajar-plugin/project.xml
    incubator/apollo/trunk/maven.xml
    incubator/apollo/trunk/project.xml
    incubator/apollo/trunk/sign-release.bat
    incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
    incubator/apollo/trunk/src/site/content/example/build.xml
    incubator/apollo/trunk/src/site/content/example/soapclient.xml
    incubator/apollo/trunk/src/site/content/example/test.xml
    incubator/apollo/trunk/src/site/content/tutorial/build.xml
    incubator/apollo/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap
    incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml
    incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java
    incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java
    incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java
    incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java
    incubator/apollo/trunk/src/site/content/xdocs/contact_info.xml
    incubator/apollo/trunk/src/site/content/xdocs/index.xml
    incubator/apollo/trunk/src/site/content/xdocs/issue_tracking.xml
    incubator/apollo/trunk/src/site/content/xdocs/release.xml
    incubator/apollo/trunk/src/site/content/xdocs/release_notes.xml
    incubator/apollo/trunk/src/site/content/xdocs/site.xml
    incubator/apollo/trunk/src/site/content/xdocs/tabs.xml
    incubator/apollo/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml
    incubator/apollo/trunk/src/site/content/xdocs/version_control.xml
    incubator/apollo/trunk/src/site/skinconf.xml
    incubator/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml
    incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java
    incubator/apollo/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt
    incubator/apollo/trunk/src/webapp/index.html
    incubator/apollo/trunk/wsa-xbeans/project.xml
    incubator/apollo/trunk/wsrf-xbeans/project.xml

Modified: incubator/apollo/trunk/BUILD.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/BUILD.txt?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/BUILD.txt (original)
+++ incubator/apollo/trunk/BUILD.txt Mon Jun 20 08:18:38 2005
@@ -1,7 +1,7 @@
-Building the Apollo jar and running the unit tests
+Building the WSRF jar and running the unit tests
 --------------------------------------------------
 1) Install Maven as desribed below.
-2) cd to the Apollo project directory (e.g. /projects/apollo/trunk).
+2) cd to the WSRF project directory (e.g. /projects/wsrf/trunk).
 3) If you are behind a corporate firwall and use an HTTP proxy to reach out to
    the World Wide Web, edit 'project.properties' file to uncomment the following
    line:
@@ -11,11 +11,11 @@
    and replace <proxy-name> and <proxy-port> with appropriate values for your setup.
 4) Run 'maven jar'.
 
-Building the Apollo distribution zipfiles
+Building the WSRF distribution zipfiles
 -----------------------------------------
 1) Install Maven as described below.
 2) Install Forrest as described below.
-3) cd to the Apollo project directory (e.g. /projects/apollo/trunk).
+3) cd to the WSRF project directory (e.g. /projects/wsrf/trunk).
 4) If you are behind a corporate firwall and use an HTTP proxy to reach out to
    the World Wide Web, edit 'project.properties' file to uncomment the following
    line:
@@ -24,9 +24,9 @@
    
    and replace <proxy-name> and <proxy-port> with appropriate values for your setup.
 5) Run 'maven dist'. (Note: this can take five minutes or longer to complete)
-   This command creates binary and source zip files 'apollo-<rev_label>.zip' and
-   'apollo-<rev_label>-src.zip' under target/distributions sub directory. To work 
-   with Apollo, unzip the binary zip file to a convenient location and follow the
+   This command creates binary and source zip files 'wsrf-<rev_label>.zip' and
+   'wsrf-<rev_label>-src.zip' under target/distributions sub directory. To work 
+   with WSRF, unzip the binary zip file to a convenient location and follow the
    'Getting Started' instructions.
 
 Installing Maven

Modified: incubator/apollo/trunk/README.html
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/README.html?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/README.html (original)
+++ incubator/apollo/trunk/README.html Mon Jun 20 08:18:38 2005
@@ -5,13 +5,10 @@
 
 <html>
 <head>
-<title>Apollo README</title>
+<title>WSRF README</title>
 <meta http-equiv="refresh" content="0;url=file:docs/index.html">
 </head>
 <body>
-<h1>Incubator Disclaimer</h1>
-<p>
- The Apollo project is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by Davanum Srinivas. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-</p>
+
 </body>
 </html>

Modified: incubator/apollo/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/build.properties.sample?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/build.properties.sample (original)
+++ incubator/apollo/trunk/build.properties.sample Mon Jun 20 08:18:38 2005
@@ -13,4 +13,4 @@
 
 # INTELLIJ PLUGIN
 ##################
-idea.project.iml = C:/IdeaProjects/Apollo/Apollo.iml
+idea.project.iml = C:/IdeaProjects/wsrf/wsrf.iml

Modified: incubator/apollo/trunk/commonj-twm/project.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/commonj-twm/project.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/commonj-twm/project.xml (original)
+++ incubator/apollo/trunk/commonj-twm/project.xml Mon Jun 20 08:18:38 2005
@@ -11,7 +11,7 @@
   <pomVersion>3</pomVersion>
   <name>CommonJ Timer/WorkManager APIs</name>
   <id>commonj-twm-api</id>
-  <groupId>apollo</groupId>
+  <groupId>wsrf</groupId>
   <currentVersion>1.1</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>

Modified: incubator/apollo/trunk/cutting_releases.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/cutting_releases.txt?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/cutting_releases.txt (original)
+++ incubator/apollo/trunk/cutting_releases.txt Mon Jun 20 08:18:38 2005
@@ -8,16 +8,16 @@
 - Make sure any "garbage" is cleaned out of your trunk dir....i.e. quick-test files, example/interop builds etc
 - Make sure all code is checked in
 - Turn off debug in log4j files in projects under src/webapp/web-inf/classes...Set to INFO
-- Update projects' project.xml for version (at top and deps for hermes and muse --i.e. update apollo dep in hermes)
+- Update projects' project.xml for version (at top and deps for pubscribe and muse --i.e. update wsrf dep in pubscribe)
 - For each project, Add an entry to the forrest site for the distribution
 
 BUILD
 -----------------------
-- Maven dist the Apollo project (dist will "clean")
+- Maven dist the WSRF project (dist will "clean")
 - Verify dist is "clean" and working   
-- Winscp the Apoolo JAR (under target) to the Apollo Repo cvs.apache.org/repository/Apollo
-- Maven dist the Hermes project (dist will "clean")
-- Winscp the Hermes JAR (under target) to the Hermes Repo cvs.apache.org/repository/Hermes 
+- Winscp the Apoolo JAR (under target) to the WSRF Repo cvs.apache.org/repository/WSRF
+- Maven dist the Pubscribe project (dist will "clean")
+- Winscp the Pubscribe JAR (under target) to the Pubscribe Repo cvs.apache.org/repository/Pubscribe 
 - Maven dist the Muse project (dist will "clean")
 - Winscp the Muse JAR (under target) to the Muse Repo cvs.apache.org/repository/Muse 
 
@@ -37,6 +37,6 @@
 POST-STEPS
 ------------------------
 - revert all log4j files back to debug
-- update projects' project.xml to devel version including SNAPSHOT (make sure to get deps in hermes(apollo) and muse(hermes, apollo) 
+- update projects' project.xml to devel version including SNAPSHOT (make sure to get deps in Pubscribe(wsrf) and muse(pubscribe, wsrf) 
 - build projects' jars with the new names
 - upload jars using winscp

Modified: incubator/apollo/trunk/forrest.properties
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/forrest.properties?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/forrest.properties (original)
+++ incubator/apollo/trunk/forrest.properties Mon Jun 20 08:18:38 2005
@@ -7,7 +7,7 @@
 forrest.echo = true
 
 # Project name (used to name .war file)
-project.name = apollo
+project.name = wsrf
 
 # Specifies name of Forrest skin to use
 project.skin = pelt

Modified: incubator/apollo/trunk/jndi-config/project.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/jndi-config/project.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/jndi-config/project.xml (original)
+++ incubator/apollo/trunk/jndi-config/project.xml Mon Jun 20 08:18:38 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- Apollo JNDI-CONFIG Project Descriptor - defines Project Object Model (POM) -->
+<!-- WSRF JNDI-CONFIG Project Descriptor - defines Project Object Model (POM) -->
 
 <!-- Schema for this file is at:    http://maven.apache.org/xsd/maven-project-3.0.0.xsd -->
 <!-- Reference for this file is at: http://maven.apache.org/reference/project-descriptor.html -->
@@ -9,9 +9,9 @@
          xsi:noNamespaceSchemaLocation="http://maven.apache.org/xsd/maven-project-3.0.0.xsd">
 
   <pomVersion>3</pomVersion>
-  <name>Apollo JNDI-Config XmlBean Generation</name>
-  <id>apollo-jndi-config</id>
-  <groupId>apollo</groupId>
+  <name>WSRF JNDI-Config XmlBean Generation</name>
+  <id>wsrf-jndi-config</id>
+  <groupId>wsrf</groupId>
   <currentVersion>SNAPSHOT</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
@@ -62,10 +62,10 @@
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
+      <groupId>wsrf</groupId>
       <artifactId>wsa-xbeans</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <usage>XMLBeans for WSA spec types</usage>

Modified: incubator/apollo/trunk/maven-plugins/maven-ajar-plugin/project.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/maven-plugins/maven-ajar-plugin/project.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/maven-plugins/maven-ajar-plugin/project.xml (original)
+++ incubator/apollo/trunk/maven-plugins/maven-ajar-plugin/project.xml Mon Jun 20 08:18:38 2005
@@ -59,7 +59,7 @@
   </dependencies>
 
   <build>
-    <nagEmailAddress>apollo-dev@ws.apache.org</nagEmailAddress>
+    <nagEmailAddress>wsrf-dev@ws.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>

Modified: incubator/apollo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/maven.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/maven.xml (original)
+++ incubator/apollo/trunk/maven.xml Mon Jun 20 08:18:38 2005
@@ -125,22 +125,22 @@
   <!-- ================================================================== -->
   <postGoal name="war:webapp">
 
-    <!-- Delete the Apollo classes that war:webapp copied into WEB-INF/classes/. -->
+    <!-- Delete the WSRF classes that war:webapp copied into WEB-INF/classes/. -->
     <delete includeEmptyDirs="true"><fileset dir="${maven.war.webapp.dir}/WEB-INF/classes" excludes="*.*" /></delete>
 
     <!-- Delete empty WEB-INF/tld/ dir that war plugin created -->
     <delete dir="${maven.war.webapp.dir}/WEB-INF/tld" />    
 
-    <!-- Build Apollo jar and copy it into WEB-INF/lib/. -->
+    <!-- Build WSRF jar and copy it into WEB-INF/lib/. -->
     <j:set var="maven.test.skip" value="true" />
     <attainGoal name="jar:jar" />
     <copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${maven.war.webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true" />
 
     <!-- Extract Spec Wsdls and Xsds from Generated Jars -->
-    <j:set var="wsdljar" value="${pom.getDependencyPath('apollo:wsa-xbeans')}"/>    
+    <j:set var="wsdljar" value="${pom.getDependencyPath('wsrf:wsa-xbeans')}"/>    
     <attainGoal name="extract-wsdl-jar"/>    
     
-    <j:set var="wsdljar" value="${pom.getDependencyPath('apollo:wsrf-xbeans')}"/>    
+    <j:set var="wsdljar" value="${pom.getDependencyPath('wsrf:wsrf-xbeans')}"/>    
     <attainGoal name="extract-wsdl-jar"/>
     
     <attainGoal name="dep-license-files" />
@@ -175,7 +175,7 @@
   <!-- ================================================================== -->
   <postGoal name="dist:prepare-bin-filesystem">
 
-    <!-- Delete the Apollo jar that dist:prepare-bin-filesystem placed in the dist dir. -->
+    <!-- Delete the WSRF jar that dist:prepare-bin-filesystem placed in the dist dir. -->
     <delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
 
     <attainGoal name="war:webapp" />

Modified: incubator/apollo/trunk/project.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/project.xml (original)
+++ incubator/apollo/trunk/project.xml Mon Jun 20 08:18:38 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- Maven Project Descriptor Apollo Project (defines Project Object Model (POM)) -->
+<!-- Maven Project Descriptor WSRF Project (defines Project Object Model (POM)) -->
 
 <!-- Schema for this file is at:    http://maven.apache.org/xsd/maven-project-3.0.0.xsd -->
 <!-- Reference for this file is at: http://maven.apache.org/reference/project-descriptor.html -->
@@ -9,9 +9,9 @@
   xsi:noNamespaceSchemaLocation="http://maven.apache.org/xsd/maven-project-3.0.0.xsd">
 
   <pomVersion>3</pomVersion>
-  <id>apollo-incubating</id>
-  <name>Apollo</name>
-  <groupId>apollo</groupId>
+  <id>wsrf</id>
+  <name>WSRF</name>
+  <groupId>wsrf</groupId>
   <currentVersion>1.0-SNAPSHOT</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
@@ -21,9 +21,9 @@
   <inceptionYear>2004</inceptionYear>
   <package>org.apache.ws</package>
   <description>A robust Java implementation of the OASIS WS-ResourceFramework (WSRF) family of specifications.</description>
-  <shortDescription>Apollo Project</shortDescription>
-  <url>http://incubator.apache.org/apollo/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/jira/browse/Apollo</issueTrackingUrl>
+  <shortDescription>WSRF Project</shortDescription>
+  <url>http://ws.apache.org/ws-fx/wsrf/</url>
+  <issueTrackingUrl>http://issues.apache.org/jira/browse/Apollo</issueTrackingUrl>
 
   <repository>
     <connection>scm|svn|http://svn.apache.org/repos/asf/incubator/apollo/trunk/</connection>
@@ -41,10 +41,10 @@
 
   <mailingLists>
     <mailingList>
-      <name>Apollo Developer List</name>
-      <subscribe>apollo-dev-subscribe@ws.apache.org</subscribe>
-      <unsubscribe>apollo-dev-unsubscribe@ws.apache.org</unsubscribe>
-      <archive>http://ws.apache.org/mail/apollo-dev/</archive>
+      <name>WSRF Developer List</name>
+      <subscribe>wsrf-dev-subscribe@ws.apache.org</subscribe>
+      <unsubscribe>wsrf-dev-unsubscribe@ws.apache.org</unsubscribe>
+      <archive>http://ws.apache.org/mail/wsrf-dev/</archive>
     </mailingList>
   </mailingLists>
 
@@ -100,10 +100,10 @@
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
+      <groupId>wsrf</groupId>
       <artifactId>wsa-xbeans</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <usage>Needed for handling requests. This contains the XmlBeans-generated code from the WSA WSDLs/XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>
@@ -112,10 +112,10 @@
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
+      <groupId>wsrf</groupId>
       <artifactId>wsrf-xbeans</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <usage>Needed for handling requests. This contains the XmlBeans-generated code from the WSRF WSDLs/XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>
@@ -124,10 +124,10 @@
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
-      <artifactId>apollo-jndi-config</artifactId>
+      <groupId>wsrf</groupId>
+      <artifactId>wsrf-jndi-config</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <war.bundle>true</war.bundle>
@@ -172,7 +172,7 @@
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
+      <groupId>wsrf</groupId>
       <artifactId>commonj-twm-api</artifactId>
       <version>1.1</version>
       <url>http://dev2dev.bea.com/technologies/commonj/twm/</url>
@@ -430,7 +430,7 @@
 
   <build>
   
-    <nagEmailAddress>apollo-dev@ws.apache.org</nagEmailAddress>
+    <nagEmailAddress>wsrf-dev@ws.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
     <unitTest>

Modified: incubator/apollo/trunk/sign-release.bat
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/sign-release.bat?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/sign-release.bat (original)
+++ incubator/apollo/trunk/sign-release.bat Mon Jun 20 08:18:38 2005
@@ -3,12 +3,12 @@
 set KEYNAME=Sal Campana
 set VERSION=incubating-1.0-beta
 
-REM APOLLO
-set BASENAME=apollo-%VERSION%
+REM WSRF
+set BASENAME=wsrf-%VERSION%
 call generate-keys.bat
 
-REM HERMES
-set BASENAME=hermes-%VERSION%
+REM Pubscribe
+set BASENAME=pubscribe-%VERSION%
 call generate-keys.bat
 
 REM Muse

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Mon Jun 20 08:18:38 2005
@@ -24,7 +24,7 @@
 import org.apache.ws.addressing.XmlBeansEndpointReference;
 import org.apache.ws.resource.InvalidResourceKeyException;
 import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.PersistentResource;
+//todo sjc is it gone ips?? import org.apache.ws.resource.PersistentResource;
 import org.apache.ws.resource.PropertiesResource;
 import org.apache.ws.resource.Resource;
 import org.apache.ws.resource.ResourceCreationEvent;
@@ -349,10 +349,13 @@
         }
         Class resourceClass = getResourceClass();
 
-        if ( PersistentResource.class.isAssignableFrom( resourceClass ) )
+        //todo sjc is it gone ips??
+   /*     if ( PersistentResource.class.isAssignableFrom( resourceClass ) )
         {
             m_resourceIsPersistent = true;
-        }
+        }*/
+        //end todo
+
         Context initialContext = new InitialContext();
         initResourceMap( initialContext );
         m_lockManager = new LockManager();
@@ -492,7 +495,7 @@
     {
         Resource resource = createInstance( key );
         LOG.debug( MSG.getMessage( Keys.LOADING_RESOURCE_FROM_PERSISTENCE, String.valueOf( key ) ) );
-        ( (PersistentResource) resource ).load( key );
+        //todo sjc is it gone ips?? ( (PersistentResource) resource ).load( key );
         if ( ResourceSweeper.isExpired( resource ) )
         {
             throw new ResourceUnknownException( getLookupKey( key ), getServicePortName() );

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java Mon Jun 20 08:18:38 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 2004 The Apache Software Foundation.
- * 
+ *
  * Licensed 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.
@@ -462,7 +462,7 @@
     public static void main( String[] args ) throws Exception
     {
         WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        String wsdlPath = "C:\\opt\\hermes-1.0-beta1\\webapps\\hermes\\wsdl\\FileSystem.wsdl";
+        String wsdlPath = "C:\\opt\\pubscribe-1.0-beta1\\webapps\\pubscribe\\wsdl\\FileSystem.wsdl";
         Definition def = wsdlReader.readWSDL( wsdlPath );
         PortType portType = (PortType) def.getPortTypes().values().toArray()[0];
         ResourceCapability wsResourceDef = null;

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java Mon Jun 20 08:18:38 2005
@@ -437,7 +437,7 @@
         }
 
         /*
-         * These props are for JIRA APOLLO-4 and could be added to context obj
+         * These props are for JIRA WSRF-4 and could be added to context obj
          * The question is whether the service name here should be the real wsdl
          * service name or the service name as we use it...
          */

Modified: incubator/apollo/trunk/src/site/content/example/build.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/build.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/build.xml Mon Jun 20 08:18:38 2005
@@ -17,18 +17,18 @@
    <property name="wsdl.file"    location="${basedir}\src\wsdl\wsrf-Interop-2.0-draft-03.wsdl" />
    <property name="xsd.file"     location="${basedir}\src\wsdl\wsrf-Interop-2.0-draft-03.xsd" />
 
-   <target name="init" unless="apollo.classpath">
+   <target name="init" unless="wsrf.classpath">
              
      <fail message="Please set the location of the wsrf.webapp.dir in build.properties" unless="wsrf.webapp.dir" />
      <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
-     <path id="apollo.classpath.id">
+     <path id="wsrf.classpath.id">
        <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
        <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <fileset dir="${jar.dir}" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="apollo.classpath" refid="apollo.classpath.id" />
+     <property name="wsrf.classpath" refid="wsrf.classpath.id" />
    
    </target>   
 
@@ -38,7 +38,7 @@
       <mkdir dir="${classes.dir}" />
       <javac srcdir="${src.dir}"
              destdir="${classes.dir}"           
-             classpathref="apollo.classpath.id"
+             classpathref="wsrf.classpath.id"
              debug="on" 
              excludes="xmlbeans/**"/>         
       <copy todir="${classes.dir}" overwrite="true">
@@ -60,14 +60,14 @@
 
        <copy file="${jar.dir}/wsrf-Interop-2.0-draft-03-xbeans.jar" todir="${wsrf.webapp.dir}/WEB-INF/lib" />
        <!--  update server-config.wsdd using WsddUpdater -->
-       <taskdef name="wsddUpdater" classname="org.apache.ws.util.platform.axis.tool.WsddUpdater" classpathref="apollo.classpath.id" />
+       <taskdef name="wsddUpdater" classname="org.apache.ws.util.platform.axis.tool.WsddUpdater" classpathref="wsrf.classpath.id" />
        <property name="config.wsdd" location="${wsrf.webapp.dir}/WEB-INF/server-config.wsdd" />  <!-- normalize path -->       
        <wsddUpdater configWsdd="${config.wsdd}">   
           <wsddPaths dir="${src.dir}" includes="**/*.wsdd" />          
        </wsddUpdater>   
        
        <!-- update jndi-config.wsdd using JndiConfigUpdater -->
-       <taskdef name="jndiUpdater" classname="org.apache.ws.util.jndi.tools.JndiConfigUpdater" classpathref="apollo.classpath.id" />
+       <taskdef name="jndiUpdater" classname="org.apache.ws.util.jndi.tools.JndiConfigUpdater" classpathref="wsrf.classpath.id" />
        <property name="jndi.config" location="${wsrf.webapp.dir}/WEB-INF/classes/jndi-config.xml" />  <!-- normalize path -->       
        <jndiUpdater jndiConfig="${jndi.config}">   
            <jndiConfigPaths dir="${src.dir}" includes="**/*-config.xml" />          

Modified: incubator/apollo/trunk/src/site/content/example/soapclient.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/soapclient.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/soapclient.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/soapclient.xml Mon Jun 20 08:18:38 2005
@@ -19,13 +19,13 @@
      <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." />    
      <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>         
      
-     <path id="apollo.classpath.id">
+     <path id="wsrf.classpath.id">
        <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
        <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="apollo.classpath" refid="apollo.classpath.id" />
+     <property name="wsrf.classpath" refid="wsrf.classpath.id" />
    
    </target>
 
@@ -47,7 +47,7 @@
      <concat><path><pathelement location="${xml}" /></path></concat>
      <echo />
      <echo>========================== RESPONSE ============================</echo>
-     <taskdef name="soapClient" classname="org.apache.ws.util.soap.SoapClientTask" classpath="${apollo.classpath}" />              
+     <taskdef name="soapClient" classname="org.apache.ws.util.soap.SoapClientTask" classpath="${wsrf.classpath}" />              
      <soapClient serviceURL="${url}" requestFile="${xml}" soapAction="${action}" /> 
                
    </target>

Modified: incubator/apollo/trunk/src/site/content/example/test.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/test.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/test.xml Mon Jun 20 08:18:38 2005
@@ -13,12 +13,12 @@
    
    
    
-   <target name="init" unless="apollo.classpath">
+   <target name="init" unless="wsrf.classpath">
                 
         <fail message="Please set the location of the wsrf.webapp.dir in build.properties" unless="wsrf.webapp.dir" />
         <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>                
         
-        <path id="apollo.classpath.id">
+        <path id="wsrf.classpath.id">
           <pathelement location="${test.classes.dir}"/>
           <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
           <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
@@ -26,7 +26,7 @@
           <pathelement location="${activation.jar}" />
           <pathelement location="${mail.jar}" />
         </path>
-        <property name="apollo.classpath" refid="apollo.classpath.id" />
+        <property name="wsrf.classpath" refid="wsrf.classpath.id" />
         <mkdir dir="${test.reports.dir}" />
    </target>   
 
@@ -37,7 +37,7 @@
         <sysproperty key="printerFactoryURL" value="${printerFactoryURL}"/>
         <sysproperty key="runAxis" value="${runAxis}"/>
         <classpath>	            
-	    <pathelement path="${apollo.classpath}"/>	    
+	    <pathelement path="${wsrf.classpath}"/>	    
   	</classpath>
   	<formatter type="plain"/>
   	<test name="org.oasisOpen.docs.wsrf.AllScenarios" todir="${test.reports.dir}">
@@ -50,7 +50,7 @@
      <mkdir dir="${test.classes.dir}" />
        <javac srcdir="${test.dir}"
                   destdir="${test.classes.dir}"           
-                  classpathref="apollo.classpath.id"
+                  classpathref="wsrf.classpath.id"
                   debug="on" 
                   />         
          <copy todir="${test.classes.dir}" overwrite="true">

Modified: incubator/apollo/trunk/src/site/content/tutorial/build.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/build.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/build.xml Mon Jun 20 08:18:38 2005
@@ -24,14 +24,14 @@
      <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." />    
      <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>    
      <mkdir dir="${lib.dir}" />
-     <path id="apollo.classpath.id">
+     <path id="wsrf.classpath.id">
        <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
        <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <fileset dir="${lib.dir}" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="apollo.classpath" refid="apollo.classpath.id" />
+     <property name="wsrf.classpath" refid="wsrf.classpath.id" />
       
    </target>
 
@@ -45,10 +45,10 @@
      <copy file="${sysprop.wsdl}" todir="${tmp.dir}" overwrite="true" />      
      <mkdir dir="${wsrf.webapp.dir}/wsdl" />
           
-     <taskdef name="wsdl2Java" classname="org.apache.ws.resource.tool.Wsdl2JavaTask" classpath="${apollo.classpath}" />              
+     <taskdef name="wsdl2Java" classname="org.apache.ws.resource.tool.Wsdl2JavaTask" classpath="${wsrf.classpath}" />              
      
      <wsdl2Java outputDir="${out.dir}"
-                classpath="${apollo.classpath}"
+                classpath="${wsrf.classpath}"
                 debug="off"
                 proxyHost="${http.proxyHost}"
                 proxyPort="${http.proxyPort}"

Modified: incubator/apollo/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap Mon Jun 20 08:18:38 2005
@@ -11,7 +11,7 @@
       <wsrp:SetResourceProperties xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
                                   xmlns:fs="http://ws.apache.org/resource/example/filesystem">
          <wsrp:Update>
-            <fs:MountPointDirectory>/var/tmp/apollo</fs:MountPointDirectory>
+            <fs:MountPointDirectory>/var/tmp/wsrf</fs:MountPointDirectory>
          </wsrp:Update>
       </wsrp:SetResourceProperties>
    </Body>

Modified: incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml Mon Jun 20 08:18:38 2005
@@ -19,13 +19,13 @@
      <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." />    
      <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>         
      
-     <path id="apollo.classpath.id">
+     <path id="wsrf.classpath.id">
        <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
        <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="apollo.classpath" refid="apollo.classpath.id" />
+     <property name="wsrf.classpath" refid="wsrf.classpath.id" />
    
    </target>
 
@@ -47,7 +47,7 @@
      <concat><path><pathelement location="${xml}" /></path></concat>
      <echo />
      <echo>========================== RESPONSE ============================</echo>
-     <taskdef name="soapClient" classname="org.apache.ws.util.soap.SoapClientTask" classpath="${apollo.classpath}" />              
+     <taskdef name="soapClient" classname="org.apache.ws.util.soap.SoapClientTask" classpath="${wsrf.classpath}" />              
      <soapClient serviceURL="${url}" requestFile="${xml}" soapAction="${action}" /> 
                
    </target>

Modified: incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java Mon Jun 20 08:18:38 2005
@@ -24,12 +24,12 @@
 
     public void deleteProperty(QName propQName) throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call delete for a prop whose minOccurs != 0
+        return; // no need to implement - WSRF will never call delete for a prop whose minOccurs != 0
     }
 
     public void insertProperty(Object[] prop) throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call insert for a prop whose minOccurs == its maxOccurs
+        return; // no need to implement - WSRF will never call insert for a prop whose minOccurs == its maxOccurs
     }
 
     public void updateProperty(Object[] prop) throws CallbackFailedException

Modified: incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java Mon Jun 20 08:18:38 2005
@@ -22,12 +22,12 @@
 
     public void deleteProperty( QName propQName ) throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call delete for a prop whose minOccurs != 0
+        return; // no need to implement - WSRF will never call delete for a prop whose minOccurs != 0
     }
 
     public void insertProperty( Object[] propElems ) throws CallbackFailedException
     {
-        // Comment prop has cardinality of 1, so passed array will always have exactly one element 
+        // Comment prop has cardinality of 1, so passed array will always have exactly one element
         XmlString xString = (XmlString) propElems[0];
         m_fileSystem.setComment( xString.getStringValue() );
     }

Modified: incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java Mon Jun 20 08:18:38 2005
@@ -25,12 +25,12 @@
 
     public void deleteProperty(QName propQName) throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call delete for a prop whose minOccurs != 0
+        return; // no need to implement - WSRF will never call delete for a prop whose minOccurs != 0
     }
 
     public void insertProperty(Object[] propElems) throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call insert for a prop whose minOccurs == its maxOccurs
+        return; // no need to implement - WSRF will never call insert for a prop whose minOccurs == its maxOccurs
     }
 
     public void updateProperty(Object[] propElems) throws CallbackFailedException

Modified: incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java Mon Jun 20 08:18:38 2005
@@ -53,7 +53,7 @@
      */
     public void deleteProperty( QName propQName )  throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call delete for a prop whose minOccurs != 0
+        return; // no need to implement - WSRF will never call delete for a prop whose minOccurs != 0
     }
 
     /**
@@ -63,7 +63,7 @@
      */
     public void insertProperty( Object[] prop )  throws CallbackFailedException
     {
-        return; // no need to implement - Apollo will never call insert for a prop whose minOccurs == its maxOccurs
+        return; // no need to implement - WSRF will never call insert for a prop whose minOccurs == its maxOccurs
     }
 
     /**

Modified: incubator/apollo/trunk/src/site/content/xdocs/contact_info.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/contact_info.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/contact_info.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/contact_info.xml Mon Jun 20 08:18:38 2005
@@ -6,7 +6,7 @@
 <document>
   
   <header>
-    <title>Apollo Contact Information</title>
+    <title>WSRF Contact Information</title>
   </header>
   
   <body>
@@ -15,12 +15,12 @@
       <title>Mailing Lists</title>
       <p>
         There is currently one mailing list for the project:
-        <a href="mailto:apollo-dev@ws.apache.org">apollo-dev@ws.apache.&#248;rg</a>.        
+        <a href="mailto:wsrf-dev@ws.apache.org">wsrf-dev@ws.apache.&#248;rg</a>.        
       </p>      
       <ul>
-        <li><a href="mailto:apollo-dev-subscribe@ws.apache.org">Subscribe to List</a></li>
-        <li><a href="mailto:apollo-dev-unsubscribe@ws.apache.org">Unsubscribe from List</a></li>
-        <li>Archives: <a href="http://ws.apache.org/mail/apollo-dev/">Apache</a> , <a href="http://marc.theaimsgroup.com/?l=apollo-dev&amp;r=1&amp;w=2/">MARC</a></li>
+        <li><a href="mailto:wsrf-dev-subscribe@ws.apache.org">Subscribe to List</a></li>
+        <li><a href="mailto:wsrf-dev-unsubscribe@ws.apache.org">Unsubscribe from List</a></li>
+        <li>Archives: <a href="http://ws.apache.org/mail/wsrf-dev/">Apache</a> , <a href="http://marc.theaimsgroup.com/?l=wsrf-dev&amp;r=1&amp;w=2/">MARC</a></li>
       </ul>
       <note>In order to post to the list, it is necessary to first subscribe to it.</note>
     </section>
@@ -28,7 +28,7 @@
     <section>
       <title>Chat Rooms</title>
       <p>
-        The Apollo developers can usually be found on the 
+        The WSRF developers can usually be found on the 
         <a href="irc://irc.freenode.net/apache-ws-fx"><code>#apache-ws-fx</code>
         channel on the <code>irc.freenode.net</code> IRC server</a>.
       </p>

Modified: incubator/apollo/trunk/src/site/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/index.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/index.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/index.xml Mon Jun 20 08:18:38 2005
@@ -24,7 +24,7 @@
 			<title>News</title>
 			<ul>
 				<li>(June 3, 2005) WSRF has graduated from incubation and is now an official Apache project! </li>
-				<li>(May 25, 2005) <a href="http://cvs.apache.org/dist/incubator/apollo/1.0-beta/">Apollo 1.0 Beta</a> is
+				<li>(May 25, 2005) <a href="http://cvs.apache.org/dist/incubator/apollo/1.0-beta/">WSRF 1.0 Beta</a> is
 				 now available!</li>
 			</ul>
 		</section>

Modified: incubator/apollo/trunk/src/site/content/xdocs/issue_tracking.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/issue_tracking.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/issue_tracking.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/issue_tracking.xml Mon Jun 20 08:18:38 2005
@@ -5,15 +5,15 @@
 <document>
   
   <header>
-    <title>Apollo Issue Tracking</title>
+    <title>WSRF Issue Tracking</title>
   </header>
   
   <body>
     <p>
-      Apollo issues (bugs, as well as enhancement requests) are tracked in 
-      Apache JIRA <a href="http://nagoya.apache.org/jira/browse/Apollo">here</a>.
+      WSRF issues (bugs, as well as enhancement requests) are tracked in 
+      Apache JIRA <a href="http://issues.apache.org/jira/browse/Apollo">here</a>.
       If you aren't sure whether something is a bug, post a question on the
-      Apollo <a href="contact_info.html">mailing list</a>.
+      WSRF <a href="contact_info.html">mailing list</a>.
     </p>
   </body>
   

Modified: incubator/apollo/trunk/src/site/content/xdocs/release.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/release.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/release.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/release.xml Mon Jun 20 08:18:38 2005
@@ -5,7 +5,7 @@
 <document>
   
   <header>
-    <title>Apollo - Releases</title>
+    <title>WSRF - Releases</title>
   </header>
   
   <body>

Modified: incubator/apollo/trunk/src/site/content/xdocs/release_notes.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/release_notes.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/release_notes.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/release_notes.xml Mon Jun 20 08:18:38 2005
@@ -4,7 +4,7 @@
 
 <document> 
   <header> 
-    <title>Apollo Release Notes</title> 
+    <title>WSRF Release Notes</title> 
   </header> 
   <body> 
     <section>

Modified: incubator/apollo/trunk/src/site/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/site.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/site.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/site.xml Mon Jun 20 08:18:38 2005
@@ -12,7 +12,7 @@
 
 See http://forrest.apache.org/docs/linking.html for more info.
 -->
-<site label="Apollo" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="home">
+<site label="WSRF" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="home">
 	<project label="Project Info" tab="home">
 		<overview label="Overview" href="index.html"/>
 		<vcs label="Version Control" href="version_control.html"/>
@@ -60,7 +60,7 @@
 		<xmlbeans.apache.org href="http://xmlbeans.apache.org/"/>
 		<maven.apache.org href="http://maven.apache.org/"/>
 		<incubator.apache.org href="http://incubator.apache.org/">
-			<apollo href="apollo/"/>
+			<wsrf href="wsrf/"/>
 		</incubator.apache.org>
 		<ws.apache.org href="http://ws.apache.org/">
 			<mirrors href="mirrors.cgi"/>
@@ -74,7 +74,7 @@
 		<cvs.apache.org href="http://cvs.apache.org/">
 			<viewcvs href="viewcvs/">
 				<wsfx-cvs href="ws-fx/">
-					<apollo-cvs href="apollo/"/>
+					<wsrf-cvs href="wsrf/"/>
 				</wsfx-cvs>
 			</viewcvs>
 		</cvs.apache.org>

Modified: incubator/apollo/trunk/src/site/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/tabs.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/tabs.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/tabs.xml Mon Jun 20 08:18:38 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" 
           "tab-cocoon-v11.dtd">
-<tabs software="Apollo" title="Apollo" copyright="The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink">
+<tabs software="WSRF" title="WSRF" copyright="The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink">
 	<!-- The rules are:
     @dir will always have /index.html added.
     @href is not modified unless it is root-relative and obviously specifies a

Modified: incubator/apollo/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml Mon Jun 20 08:18:38 2005
@@ -34,20 +34,20 @@
 			<title>Using the Ant Task</title>
 			<p>The Wsdl2Java tool is invoked using an Ant task, as shown by the following example:</p>
 			<source><![CDATA[
-        <property name="wsrf.webapp.dir" location="${apollo.home}/webapps/wsrf" />
+        <property name="wsrf.webapp.dir" location="${wsrf.home}/webapps/wsrf" />
 
-        <path id="apollo.classpath.id">
+        <path id="wsrf.classpath.id">
           <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
           <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
         </path>
 
-        <taskdef name="wsdl2Java" classname="org.apache.ws.resource.tool.Wsdl2JavaTask" classpathref="apollo.classpath.id" />
+        <taskdef name="wsdl2Java" classname="org.apache.ws.resource.tool.Wsdl2JavaTask" classpathref="wsrf.classpath.id" />
 
         <wsdl2Java wsdl="path/to/your.wsdl"
                    outputdir="generated"                   
-                   classpathref="apollo.classpath.id" />
+                   classpathref="wsrf.classpath.id" />
       ]]></source>
-			<note>The apollo.home Ant property used above has to be set to <code>INSTALL_DIR</code> (e.g. /opt/apollo-1.0beta).</note>
+			<note>The wsrf.home Ant property used above has to be set to <code>INSTALL_DIR</code> (e.g. /opt/wsrf-1.0beta).</note>
             		<p><img src="images/back.gif" alt="go to the previous step"></img><a href="site:wsdl">Back</a>  <img src="images/next.gif" 
             		alt="go to the next step"></img><a href="site:service">Next</a>
 			</p>

Modified: incubator/apollo/trunk/src/site/content/xdocs/version_control.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/version_control.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/version_control.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/version_control.xml Mon Jun 20 08:18:38 2005
@@ -5,7 +5,7 @@
 <document>
   
   <header>
-    <title>Apollo Version Control System</title>
+    <title>WSRF Version Control System</title>
   </header>
   
   <body>
@@ -13,7 +13,7 @@
     <section>
       <title>Overview</title>
       <p>
-        The Apollo source code resides in the Apache <a href="http://subversion.tigris.org/">Subversion (SVN)</a> repository.
+        The WSRF source code resides in the Apache <a href="http://subversion.tigris.org/">Subversion (SVN)</a> repository.
         The command-line SVN client can be obtained <a href="http://subversion.tigris.org/project_packages.html">here</a>.
         The TortoiseSVN GUI client for Windows can be obtained <a href="http://tortoisesvn.tigris.org/">here</a>. There
         are also SVN plugins available for both <a href="http://subclipse.tigris.org/">Eclipse</a> and 
@@ -25,7 +25,7 @@
       <title>Web Access (read-only)</title>
       <p>
         The source code can be browsed via the Web at 
-        <a href="http://svn.apache.org/viewcvs.cgi/incubator/apollo/">http://svn.apache.org/viewcvs.cgi/incubator/apollo/</a>.
+        <a href="http://svn.apache.org/viewcvs.cgi/incubator/wsrf/">http://svn.apache.org/viewcvs.cgi/incubator/wsrf/</a>.
         No SVN client software is required.
       </p>
     </section>
@@ -34,7 +34,7 @@
       <title>Anonymous Access (read-only)</title>
       <p>
         The SVN URL for anonymous users is 
-        <a href="http://svn.apache.org/repos/asf/incubator/apollo/">http://svn.apache.org/repos/asf/incubator/apollo/</a>.
+        <a href="http://svn.apache.org/repos/asf/incubator/wsrf/">http://svn.apache.org/repos/asf/incubator/wsrf/</a>.
         Instructions for anonymous SVN access are 
         <a href="http://www.apache.org/dev/version-control.html#anon-svn">here</a>.
       </p>
@@ -44,7 +44,7 @@
       <title>Committer Access (read-write)</title>
       <p>
         The SVN URL for committers is 
-        <a href="https://svn.apache.org/repos/asf/incubator/apollo/">https://svn.apache.org/repos/asf/incubator/apollo/</a>.
+        <a href="https://svn.apache.org/repos/asf/incubator/wsrf/">https://svn.apache.org/repos/asf/incubator/wsrf/</a>.
         Instructions for committer SVN access are 
         <a href="http://www.apache.org/dev/version-control.html#https-svn">here</a>.
       </p>

Modified: incubator/apollo/trunk/src/site/skinconf.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/skinconf.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/skinconf.xml (original)
+++ incubator/apollo/trunk/src/site/skinconf.xml Mon Jun 20 08:18:38 2005
@@ -57,8 +57,8 @@
 
   <!-- mandatory project logo
        skin: forrest-site renders it at the top -->
-  <project-name>Apollo</project-name>
-  <project-url>http://incubator.apache.org/apollo/</project-url>
+  <project-name>WSRF</project-name>
+  <project-url>http://ws.apache.org/ws-fx/wsrf/</project-url>
   <project-logo>images/wsrf-logo.gif</project-logo>
 
   <!-- optional group logo

Modified: incubator/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml (original)
+++ incubator/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml Mon Jun 20 08:18:38 2005
@@ -61,10 +61,10 @@
 	     	     
 	     <!-- file -->
 	     <metadata Dialect="http://www.w3.org/2001/XMLSchema" Identifier="http://ws.apache.org/resource/properties/test/sushi_file">
-		<Location>C:/Projects/apache/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
+		<Location>C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
 	     </metadata>
 	     <metadata Dialect="http://schemas.xmlsoap.org/wsdl" Identifier="http://ws.apache.org/resource/example/filesystem_file">
-		<Location>C:/Projects/apache/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/FileSystem.wsdl</Location>
+		<Location>C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/FileSystem.wsdl</Location>
 	     </metadata>
 
 	     <!-- http url -->
@@ -77,10 +77,10 @@
 
 	     <!-- file url -->
 	     <metadata Dialect="http://www.w3.org/2001/XMLSchema" Identifier="http://ws.apache.org/resource/properties/test/sushi_fileurl">
-		<Location>file://C:/Projects/apache/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
+		<Location>file://C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
 	     </metadata>
 	     <metadata Dialect="http://schemas.xmlsoap.org/wsdl" Identifier="http://ws.apache.org/resource/example/filesystem_fileurl">
-		<Location>file://C:/Projects/apache/apollo/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/FileSystem.wsdl</Location>
+		<Location>file://C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/FileSystem.wsdl</Location>
 	     </metadata>
 
 	     <!-- EndpointReference -->

Modified: incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java (original)
+++ incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java Mon Jun 20 08:18:38 2005
@@ -48,7 +48,7 @@
    protected static final String RESOURCE_PATH_SUSHI_PROPS_XML = "org/apache/ws/resource/properties/SushiProperties.xml";
    protected static final String RESOURCE_PATH_SUSHI_METADATA_XML = "org/apache/ws/resource/properties/SushiMetadata.wsrmd";
 
-   protected static final File BASE_TMP_DIR = new File( System.getProperty( "java.io.tmpdir" ), "ws.apache.org/apollo" );;
+   protected static final File BASE_TMP_DIR = new File( System.getProperty( "java.io.tmpdir" ), "ws.apache.org/wsrf" );;
    protected static final File SRC_DIR = new File( BASE_TMP_DIR, "generated_src" );
    protected static final File CLASSES_DIR = new File( BASE_TMP_DIR, "generated_classes" );
 
@@ -122,5 +122,5 @@
       CLASSES_DIR.mkdirs(); // necessary?
       return SchemaCompiler.compile( scompParams );
    }
-    
+
 }

Modified: incubator/apollo/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt (original)
+++ incubator/apollo/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt Mon Jun 20 08:18:38 2005
@@ -29,7 +29,7 @@
             
            <!-- file -->
            <metadata Dialect="http://www.w3.org/2001/XMLSchema" Identifier="http://ws.apache.org/resource/properties/test/sushi_file">
-            <Location>C:/Projects/apache/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
+            <Location>C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
            </metadata>
             
            <!-- http url -->
@@ -39,7 +39,7 @@
             
            <!-- file url -->
            <metadata Dialect="http://www.w3.org/2001/XMLSchema" Identifier="http://ws.apache.org/resource/properties/test/sushi_fileurl">
-            <Location>file://C:/Projects/apache/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
+            <Location>file://C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd</Location>
            </metadata>
             
            <!-- EndpointReference -->

Modified: incubator/apollo/trunk/src/webapp/index.html
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/index.html?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/src/webapp/index.html (original)
+++ incubator/apollo/trunk/src/webapp/index.html Mon Jun 20 08:18:38 2005
@@ -8,7 +8,7 @@
 
 <body bgcolor="#FFFFFF">
 
-<h1 align="center"><a href="http://ws.apache.org/ws-fx/wsrf"><img class="logoImage" alt="Apollo" src="images/apollo-logo.jpg" border="0"></a></h1>
+<h1 align="center"><a href="http://ws.apache.org/ws-fx/wsrf"><img class="logoImage" alt="WSRF" src="images/wsrf-logo.jpg" border="0"></a></h1>
 
 <p>Hello! <em>Welcome</em> to Apache-WSRF.</p>
 

Modified: incubator/apollo/trunk/wsa-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsa-xbeans/project.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/wsa-xbeans/project.xml (original)
+++ incubator/apollo/trunk/wsa-xbeans/project.xml Mon Jun 20 08:18:38 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- Apollo JNDI-CONFIG Project Descriptor - defines Project Object Model (POM) -->
+<!-- WSRF JNDI-CONFIG Project Descriptor - defines Project Object Model (POM) -->
 
 <!-- Schema for this file is at:    http://maven.apache.org/xsd/maven-project-3.0.0.xsd -->
 <!-- Reference for this file is at: http://maven.apache.org/reference/project-descriptor.html -->
@@ -11,7 +11,7 @@
   <pomVersion>3</pomVersion>
   <name>XmlBeans for the WSA spec types</name>
   <id>wsa-xbeans</id>
-  <groupId>apollo</groupId>
+  <groupId>wsrf</groupId>
   <currentVersion>SNAPSHOT</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>

Modified: incubator/apollo/trunk/wsrf-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsrf-xbeans/project.xml?rev=191489&r1=191488&r2=191489&view=diff
==============================================================================
--- incubator/apollo/trunk/wsrf-xbeans/project.xml (original)
+++ incubator/apollo/trunk/wsrf-xbeans/project.xml Mon Jun 20 08:18:38 2005
@@ -11,7 +11,7 @@
   <pomVersion>3</pomVersion>
   <name>XMLBeans for the WSRF spec types</name>
   <id>wsrf-xbeans</id>
-  <groupId>apollo</groupId>
+  <groupId>wsrf</groupId>
   <currentVersion>SNAPSHOT</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
@@ -86,10 +86,10 @@
     </dependency>       
 
     <dependency>
-      <groupId>apollo</groupId>
+      <groupId>wsrf</groupId>
       <artifactId>wsa-xbeans</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <usage>XMLBeans for WSA spec types</usage>



---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org