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

svn commit: r191490 - in /incubator/hermes/trunk: ./ src/examples/broker/ src/examples/pubsubclient/ src/java/org/apache/ws/eventing/ src/java/org/apache/ws/eventing/pubsub/ src/java/org/apache/ws/notification/base/impl/ src/java/org/apache/ws/notifica...

Author: scamp
Date: Mon Jun 20 08:19:44 2005
New Revision: 191490

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

Removed:
    incubator/hermes/trunk/README.txt
Modified:
    incubator/hermes/trunk/BUILD.txt
    incubator/hermes/trunk/build.properties.sample
    incubator/hermes/trunk/forrest.properties
    incubator/hermes/trunk/maven.xml
    incubator/hermes/trunk/project.properties
    incubator/hermes/trunk/project.xml
    incubator/hermes/trunk/src/examples/broker/Broker.java
    incubator/hermes/trunk/src/examples/broker/build.properties
    incubator/hermes/trunk/src/examples/broker/build.xml
    incubator/hermes/trunk/src/examples/pubsubclient/PubSubClient.java
    incubator/hermes/trunk/src/examples/pubsubclient/PubSubWSmanager.java
    incubator/hermes/trunk/src/examples/pubsubclient/build.properties
    incubator/hermes/trunk/src/examples/pubsubclient/build.xml
    incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
    incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
    incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
    incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java
    incubator/hermes/trunk/src/site/content/tutorial/FileSystem.wsdl
    incubator/hermes/trunk/src/site/content/tutorial/build.properties
    incubator/hermes/trunk/src/site/content/tutorial/build.xml
    incubator/hermes/trunk/src/site/content/tutorial/requests/BadGetCurrentMessage.soap
    incubator/hermes/trunk/src/site/content/tutorial/requests/GetCurrentMessage.soap
    incubator/hermes/trunk/src/site/content/tutorial/requests/Pause_Subscription.soap
    incubator/hermes/trunk/src/site/content/tutorial/requests/Resume_Subscription.soap
    incubator/hermes/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap
    incubator/hermes/trunk/src/site/content/tutorial/requests/Subscribe_updateMountPointProp.soap
    incubator/hermes/trunk/src/site/content/tutorial/soapclient.xml
    incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java
    incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java
    incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java
    incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java
    incubator/hermes/trunk/src/site/content/xdocs/contact_info.xml
    incubator/hermes/trunk/src/site/content/xdocs/index.xml
    incubator/hermes/trunk/src/site/content/xdocs/issue_tracking.xml
    incubator/hermes/trunk/src/site/content/xdocs/manual/index.xml
    incubator/hermes/trunk/src/site/content/xdocs/release.xml
    incubator/hermes/trunk/src/site/content/xdocs/release_notes.xml
    incubator/hermes/trunk/src/site/content/xdocs/site.xml
    incubator/hermes/trunk/src/site/content/xdocs/tabs.xml
    incubator/hermes/trunk/src/site/content/xdocs/tutorial/index.xml
    incubator/hermes/trunk/src/site/content/xdocs/version_control.xml
    incubator/hermes/trunk/src/site/skinconf.xml
    incubator/hermes/trunk/src/test/org/apache/ws/notification/base/impl/UnitResourceContext.java
    incubator/hermes/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt
    incubator/hermes/trunk/src/webapp/index.html
    incubator/hermes/trunk/wse-xbeans/project.xml
    incubator/hermes/trunk/wsn-xbeans/project.xml

Modified: incubator/hermes/trunk/BUILD.txt
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/BUILD.txt?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/BUILD.txt (original)
+++ incubator/hermes/trunk/BUILD.txt Mon Jun 20 08:19:44 2005
@@ -1,14 +1,14 @@
-Building the Hermes jar and running the unit tests
+Building the Pubscribe jar and running the unit tests
 --------------------------------------------------
 1) Install Maven as desribed below.
-2) cd to the Hermes project directory (e.g. /projects/hermes/trunk).
+2) cd to the Pubscribe project directory (e.g. /projects/pubscribe/trunk).
 3) Run 'maven jar'.
 
-Building the Hermes distribution zipfiles
+Building the Pubscribe distribution zipfiles
 -----------------------------------------
 1) Install Maven as described below.
 2) Install Forrest as described below.
-3) cd to the Hermes project directory (e.g. /projects/hermes/trunk).
+3) cd to the Pubscribe project directory (e.g. /projects/pubscribe/trunk).
 4) Run 'maven dist'. (Note: this can take five minutes or longer to complete)
 
 Installing Maven

Modified: incubator/hermes/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/build.properties.sample?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/build.properties.sample (original)
+++ incubator/hermes/trunk/build.properties.sample Mon Jun 20 08:19:44 2005
@@ -13,4 +13,4 @@
 
 # INTELLIJ PLUGIN
 ##################
-idea.project.iml = C:/IdeaProjects/Hermes/hermes.iml
+idea.project.iml = C:/IdeaProjects/pubscribe/pubscribe.iml

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

Modified: incubator/hermes/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/maven.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/maven.xml (original)
+++ incubator/hermes/trunk/maven.xml Mon Jun 20 08:19:44 2005
@@ -105,22 +105,22 @@
   <!-- ================================================================== -->
   <postGoal name="war:webapp">    
     
-    <!-- Delete the Hermes classes that war:webapp copied into WEB-INF/classes/. -->
+    <!-- Delete the Pubscribe classes that war:webapp copied into WEB-INF/classes/. -->
     <delete includeEmptyDirs="true"><fileset dir="${maven.war.webapp.dir}/WEB-INF/classes" excludes="*.*" /></delete>
 
-    <!-- Build Hermes jar and copy it into WEB-INF/lib/. -->
+    <!-- Build Pubscribe 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"/>
     
-    <j:set var="wsdljar" value="${pom.getDependencyPath('hermes:wsn-xbeans')}"/>    
+    <j:set var="wsdljar" value="${pom.getDependencyPath('pubscribe:wsn-xbeans')}"/>    
     <attainGoal name="extract-wsdl-jar"/> 
         
     
@@ -157,7 +157,7 @@
   <!-- ================================================================== -->
   <postGoal name="dist:prepare-bin-filesystem">
 
-    <!-- Delete the Apollo jar that dist:prepare-bin-filesystem placed in the dist dir. -->
+    <!-- Delete the 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/hermes/trunk/project.properties
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/project.properties?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/project.properties (original)
+++ incubator/hermes/trunk/project.properties Mon Jun 20 08:19:44 2005
@@ -27,7 +27,7 @@
 ##############
 # Target dir for our webapp
 maven.war.build.dir = ${maven.build.dir}
-webapp.name = hermes
+webapp.name = pubscribe
 maven.war.webapp.dir = ${maven.war.build.dir}/${webapp.name}
 
 # JALOPY PLUGIN

Modified: incubator/hermes/trunk/project.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/project.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/project.xml (original)
+++ incubator/hermes/trunk/project.xml Mon Jun 20 08:19:44 2005
@@ -9,9 +9,9 @@
   xsi:noNamespaceSchemaLocation="http://maven.apache.org/xsd/maven-project-3.0.0.xsd">
 
   <pomVersion>3</pomVersion>
-  <id>hermes-incubating</id>
-  <name>Hermes</name>
-  <groupId>hermes</groupId>
+  <id>pubscribe</id>
+  <name>Pubscribe</name>
+  <groupId>pubscribe</groupId>
   <currentVersion>1.0-SNAPSHOT</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
@@ -20,9 +20,9 @@
   <inceptionYear>2004</inceptionYear>
   <package>org.apache.ws</package>
   <description>A robust Java implementation of the OASIS WS-Notification (WSN) family of specifications.</description>
-  <shortDescription>Hermes Project</shortDescription>
-  <url>http://incubator.apache.org/hermes/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/jira/browse/Hermes</issueTrackingUrl>
+  <shortDescription>Pubscribe Project</shortDescription>
+  <url>http://ws.apache.org/ws-fx/pubscribe/</url>
+  <issueTrackingUrl>http://issues.apache.org/jira/browse/HERMES</issueTrackingUrl>
 
   <repository>
     <connection>scm|svn|http://svn.apache.org/repos/asf/incubator/hermes/trunk/</connection>
@@ -40,11 +40,17 @@
 
   <mailingLists>
     <mailingList>
-      <name>Hermes Developer List</name>
-      <subscribe>hermes-dev-subscribe@ws.apache.org</subscribe>
-      <unsubscribe>hermes-dev-unsubscribe@ws.apache.org</unsubscribe>
-      <archive>http://ws.apache.org/mail/hermes-dev/</archive>
+      <name>Pubscribe Developer List</name>
+      <subscribe>pubscribe-dev-subscribe@ws.apache.org</subscribe>
+      <unsubscribe>pubscribe-dev-unsubscribe@ws.apache.org</unsubscribe>
+      <archive>http://ws.apache.org/mail/pubscribe-dev/</archive>
     </mailingList>
+    <mailingList>
+      <name>Pubscribe SVN List</name>
+      <subscribe>pubscribe-svn-subscribe@ws.apache.org</subscribe>
+      <unsubscribe>pubscribe-svn-unsubscribe@ws.apache.org</unsubscribe>
+      <archive>http://ws.apache.org/mail/pubscribe-svn/</archive>
+    </mailingList>    
   </mailingLists>
 
   <developers>
@@ -110,10 +116,10 @@
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
-      <artifactId>apollo-incubating</artifactId>
+      <groupId>wsrf</groupId>
+      <artifactId>wsrf</artifactId>
       <version>1.0-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>WSRF impl</usage>
@@ -122,10 +128,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 XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>
@@ -134,10 +140,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>
@@ -146,10 +152,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>
@@ -194,7 +200,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>
@@ -299,10 +305,10 @@
     </dependency>
 
     <dependency>
-      <groupId>hermes</groupId>
+      <groupId>pubscribe</groupId>
       <artifactId>wsn-xbeans</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/hermes/</url>
+      <url>http://ws.apache.org/ws-fx/pubscribe/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <usage>XMLBeans for WSN spec types</usage>
@@ -311,10 +317,10 @@
     </dependency>
 
     <dependency>
-      <groupId>hermes</groupId>
+      <groupId>pubscribe</groupId>
       <artifactId>wse-xbeans</artifactId>
       <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/hermes/</url>
+      <url>http://ws.apache.org/ws-fx/pubscribe/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <usage>XMLBeans for WS-Eventing spec types</usage>
@@ -486,7 +492,7 @@
 
   <build>
 
-    <nagEmailAddress>hermes-dev@ws.apache.org</nagEmailAddress>
+    <nagEmailAddress>pubscribe-dev@ws.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
 

Modified: incubator/hermes/trunk/src/examples/broker/Broker.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/broker/Broker.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/broker/Broker.java (original)
+++ incubator/hermes/trunk/src/examples/broker/Broker.java Mon Jun 20 08:19:44 2005
@@ -11,19 +11,19 @@
  */
 public class Broker extends javax.swing.JFrame {
     private static final Log LOG = LogFactory.getLog( Broker.class.getName() );
-    
+
     /** Creates new form Broker */
-    public Broker(String hermes_home) {
+    public Broker(String pubscribe_home) {
         initComponents();
-        
-        LOG.info("HERMES_HOME: "+hermes_home);
-        if(hermes_home==null){
-            System.out.println("HERMES_HOME not set");
+
+        LOG.info("PUBSCRIBE_HOME: "+pubscribe_home);
+        if(pubscribe_home==null){
+            System.out.println("PUBSCRIBE_HOME not set");
         }else{
             try{
                 JettyAxisServer jas = new JettyAxisServer();
                 jas.setPort(8080);
-                jas.setResourceBase(hermes_home);
+                jas.setResourceBase(pubscribe_home);
                 jas.start();
                 LOG.info("JAS started"+jas.log.toString());
             }catch(Exception e){
@@ -31,7 +31,7 @@
             }
         }
     }
-    
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
@@ -52,7 +52,7 @@
         helpMenu = new javax.swing.JMenu();
         contentsMenuItem = new javax.swing.JMenuItem();
         aboutMenuItem = new javax.swing.JMenuItem();
-        
+
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
         fileMenu.setText("File");
         openMenuItem.setText("Open");
@@ -67,7 +67,7 @@
                 exitMenuItemActionPerformed(evt);
             }
         });
-        
+
         fileMenu.add(exitMenuItem);
         menuBar.add(fileMenu);
         editMenu.setText("Edit");
@@ -87,21 +87,21 @@
         helpMenu.add(aboutMenuItem);
         menuBar.add(helpMenu);
         setJMenuBar(menuBar);
-        
+
         pack();
     }//GEN-END:initComponents
-    
+
     private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitMenuItemActionPerformed
         System.exit(0);
     }//GEN-LAST:event_exitMenuItemActionPerformed
-    
+
     /**
      * @param args the command line arguments
      */
     public static void main(String args[]) {
         new Broker(args[0]).show();
     }
-    
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JMenuItem cutMenuItem;
     private javax.swing.JMenuItem pasteMenuItem;
@@ -118,5 +118,5 @@
     private javax.swing.JMenu fileMenu;
     private javax.swing.JMenuItem openMenuItem;
     // End of variables declaration//GEN-END:variables
-    
+
 }

Modified: incubator/hermes/trunk/src/examples/broker/build.properties
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/broker/build.properties?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/broker/build.properties (original)
+++ incubator/hermes/trunk/src/examples/broker/build.properties Mon Jun 20 08:19:44 2005
@@ -1,9 +1,9 @@
-base.url=http://localhost:8080/hermes/services
+base.url=http://localhost:8080/pubscribe/services
 
 # Uncomment and modify the below lines if you would like to deploy to a
-# hermes webapp located somewhere other than the default location of
-# ../webapps/hermes (e.g. ${env.CATALINA_HOME}/webapps/hermes)
-hermes.webapp.dir=d:/projects/hermes/trunk/target/hermes-incubating-1.0-alpha-SNAPSHOT/bin/hermes-incubating-1.0-alpha-SNAPSHOT/webapps/hermes
+# Pubscribe webapp located somewhere other than the default location of
+# ../webapps/pubscribe (e.g. ${env.CATALINA_HOME}/webapps/pubscribe)
+pubscribe.webapp.dir=
 
 # Uncomment and modify the below lines if you require a proxy to connect to external web sites
 #http.proxyHost=proxy.xyz.com

Modified: incubator/hermes/trunk/src/examples/broker/build.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/broker/build.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/broker/build.xml (original)
+++ incubator/hermes/trunk/src/examples/broker/build.xml Mon Jun 20 08:19:44 2005
@@ -10,38 +10,38 @@
 <property name="base.dir" value="${basedir}"/>    
    <target name="init">
      
-     <available file="../../webapps/hermes" type="dir" property="dist.hermes.webapp.dir" value="../../webapps/hermes" />         
-     <condition property="hermes.webapp.dir" value="${dist.hermes.webapp.dir}">
-        <isset property="dist.hermes.webapp.dir"/>
+     <available file="../../webapps/pubscribe" type="dir" property="dist.pubscribe.webapp.dir" value="../../webapps/pubscribe" />         
+     <condition property="pubscribe.webapp.dir" value="${dist.pubscribe.webapp.dir}">
+        <isset property="dist.pubscribe.webapp.dir"/>
      </condition>     
           
-     <fail unless="hermes.webapp.dir" message="webapp dir ../../webapps/hermes does not exist." />    
-     <echo>Using webapp dir: ${hermes.webapp.dir}</echo>    
+     <fail unless="pubscribe.webapp.dir" message="webapp dir ../../webapps/pubscribe does not exist." />    
+     <echo>Using webapp dir: ${pubscribe.webapp.dir}</echo>    
 
 
     <mkdir dir="build/classes"/>
     <copy file="jndi-config.xml" todir="build/classes/"/>
     <copy file="log4j.properties" todir="build/classes/"/>
-     <path id="hermes.classpath.id">
+     <path id="pubscribe.classpath.id">
        <pathelement location="build/classes" />
        <fileset dir="./lib" includes="*.jar" />
-       <pathelement location="${hermes.webapp.dir}/WEB-INF/classes" />
-       <fileset dir="${hermes.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+       <pathelement location="${pubscribe.webapp.dir}/WEB-INF/classes" />
+       <fileset dir="${pubscribe.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="hermes.classpath" refid="hermes.classpath.id" />
+     <property name="pubscribe.classpath" refid="pubscribe.classpath.id" />
          
       </target>
   
    <target name="build" depends="init">
-    <javac srcdir="." destdir="build/classes" classpathref="hermes.classpath.id">
+    <javac srcdir="." destdir="build/classes" classpathref="pubscribe.classpath.id">
       <include name="*.java"/>
     </javac>
   </target>
   
   <target name="execute" depends="build">
-       <java classname="Broker" classpathref="hermes.classpath.id" fork="true">
+       <java classname="Broker" classpathref="pubscribe.classpath.id" fork="true">
         <arg value="${base.dir}"/>
               </java>
   </target>

Modified: incubator/hermes/trunk/src/examples/pubsubclient/PubSubClient.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/pubsubclient/PubSubClient.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/pubsubclient/PubSubClient.java (original)
+++ incubator/hermes/trunk/src/examples/pubsubclient/PubSubClient.java Mon Jun 20 08:19:44 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 2001-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.
@@ -1422,21 +1422,21 @@
     }
 
 
-    public PubSubClient(String hermes_home) throws Exception{
-        super ( "Apache Hermes Client" );
+    public PubSubClient(String pubscribe_home) throws Exception{
+        super ( "Apache Pubscribe Client" );
 
         notebook = new JTabbedPane();
         this.getContentPane().add( notebook );
 
-        PubSubWSmanager pman = new PubSubWSmanager(hermes_home);
+        PubSubWSmanager pman = new PubSubWSmanager(pubscribe_home);
 
-        ConsumerPanel cpan = new ConsumerPanel(notebook,pman); 
-        PublisherPanel app2 = new PublisherPanel(notebook,pman);  
+        ConsumerPanel cpan = new ConsumerPanel(notebook,pman);
+        PublisherPanel app2 = new PublisherPanel(notebook,pman);
 
         Listener outgoing=  new Listener( notebook, "Producer", pman.outport, "localhost", 8080, false,null);
         Listener subman =  new Listener( notebook, "SubscriptionManger", 12345, "localhost", 8080, false,null);
         Listener incoming=  new Listener( notebook, "Incoming", pman.inportL, "localhost", pman.inportS, false,null);
-        
+
         this.pack();
         this.setSize( 600, 600 );
         this.setVisible( true );

Modified: incubator/hermes/trunk/src/examples/pubsubclient/PubSubWSmanager.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/pubsubclient/PubSubWSmanager.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/pubsubclient/PubSubWSmanager.java (original)
+++ incubator/hermes/trunk/src/examples/pubsubclient/PubSubWSmanager.java Mon Jun 20 08:19:44 2005
@@ -24,27 +24,27 @@
     public int inportS;
     public org.apache.ws.notification.topics.TopicSpace topicSpace;
     /** Creates a new instance of PubSubWSmanager */
-    public PubSubWSmanager(String hermes_home) throws Exception{
+    public PubSubWSmanager(String pubscribe_home) throws Exception{
         java.util.Random r = new java.util.Random(System.currentTimeMillis());
 	outport= r.nextInt(60000)+1024;
         inportL =r.nextInt(60000)+1024;
         inportS =r.nextInt(60000)+1024;
-        
+
         JettyAxisServer jas = new JettyAxisServer();
         jas.setPort(inportS);
-        jas.setResourceBase(hermes_home);
-        jas.start();       
-        
+        jas.setResourceBase(pubscribe_home);
+        jas.start();
+
         NotificationProducerFactory nprodF = NotificationProducerFactory.getInstance();
         //TODO
         //nprod= nprodF.createNotificationProducer("http://localhost:"+outport+"/axis/services/NotificationProducer","jndi-config_wsn.xml");
         nprod= nprodF.createNotificationProducer("http://localhost:"+outport+"/axis/services/NotificationProducer","jndi-config_wse.xml");
 
-        topicSpace = org.apache.ws.notification.topics.util.TopicSpaceParser.parse(Thread.currentThread().getContextClassLoader().getResourceAsStream("topicspace.xml"));   
+        topicSpace = org.apache.ws.notification.topics.util.TopicSpaceParser.parse(Thread.currentThread().getContextClassLoader().getResourceAsStream("topicspace.xml"));
         System.out.println("topicSpace : "+topicSpace);
-        
+
     }
-    
+
     public Subscription subscribe(SubscriptionListModel sl, NotificationListModel nl, String xpath, Topic t, java.util.Calendar termtime, boolean  subend){
         try{
             TopicFilter tf = null;
@@ -53,7 +53,7 @@
                 xf= new XPathFilter(xpath);
             if(t!=null)
                 tf= new TopicFilter(t);
-                
+
             NotificationConsumer c = new GUIConsumer("http://localhost:"+inportL+"/axis/services/NotificationPort",nl);
             SubscriptionEndConsumer ec = new GUIEndConsumer("http://localhost:"+inportL+"/axis/services/SubscriptionEndPort",sl);
 
@@ -62,12 +62,12 @@
         }catch(Exception e){
             e.printStackTrace();
         }
- 
+
         return null;
     }
     public void publish(String text, Topic t){
         Publisher p = PublisherFactory.getInstance().createPublisher("http://localhost:"+outport+"/axis/services/NotificationPort");
         p.publish(text,t);
     }
-    
+
 }

Modified: incubator/hermes/trunk/src/examples/pubsubclient/build.properties
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/pubsubclient/build.properties?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/pubsubclient/build.properties (original)
+++ incubator/hermes/trunk/src/examples/pubsubclient/build.properties Mon Jun 20 08:19:44 2005
@@ -1,9 +1,9 @@
-base.url=http://localhost:8080/hermes/services
+base.url=http://localhost:8080/pubscribe/services
 
 # Uncomment and modify the below lines if you would like to deploy to a
-# hermes webapp located somewhere other than the default location of
-# ../webapps/hermes (e.g. ${env.CATALINA_HOME}/webapps/hermes)
-hermes.webapp.dir=d:/projects/hermes/trunk/target/hermes-incubating-1.0-alpha-SNAPSHOT/bin/hermes-incubating-1.0-alpha-SNAPSHOT/webapps/hermes
+# pubscribe webapp located somewhere other than the default location of
+# ../webapps/pubscribe (e.g. ${env.CATALINA_HOME}/webapps/pubscribe)
+pubscribe.webapp.dir=
 
 # Uncomment and modify the below lines if you require a proxy to connect to external web sites
 #http.proxyHost=proxy.xyz.com

Modified: incubator/hermes/trunk/src/examples/pubsubclient/build.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/examples/pubsubclient/build.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/examples/pubsubclient/build.xml (original)
+++ incubator/hermes/trunk/src/examples/pubsubclient/build.xml Mon Jun 20 08:19:44 2005
@@ -10,38 +10,38 @@
 <property name="base.dir" value="${basedir}"/>    
    <target name="init">
      
-     <available file="../../webapps/hermes" type="dir" property="dist.hermes.webapp.dir" value="../../webapps/hermes" />         
-     <condition property="hermes.webapp.dir" value="${dist.hermes.webapp.dir}">
-        <isset property="dist.hermes.webapp.dir"/>
+     <available file="../../webapps/pubscribe" type="dir" property="dist.pubscribe.webapp.dir" value="../../webapps/pubscribe" />         
+     <condition property="pubscribe.webapp.dir" value="${dist.pubscribe.webapp.dir}">
+        <isset property="dist.pubscribe.webapp.dir"/>
      </condition>     
           
-     <fail unless="hermes.webapp.dir" message="webapp dir ../../webapps/hermes does not exist." />    
-     <echo>Using webapp dir: ${hermes.webapp.dir}</echo>    
+     <fail unless="pubscribe.webapp.dir" message="webapp dir ../../webapps/pubscribe does not exist." />    
+     <echo>Using webapp dir: ${pubscribe.webapp.dir}</echo>    
 
 
     <mkdir dir="build/classes"/>
     <copy file="jndi-config.xml" todir="build/classes/"/>
 
-     <path id="hermes.classpath.id">
+     <path id="pubscribe.classpath.id">
        <pathelement location="build/classes" />
        <fileset dir="./lib" includes="*.jar" />
-       <pathelement location="${hermes.webapp.dir}/WEB-INF/classes" />
-       <fileset dir="${hermes.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+       <pathelement location="${pubscribe.webapp.dir}/WEB-INF/classes" />
+       <fileset dir="${pubscribe.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="hermes.classpath" refid="hermes.classpath.id" />
+     <property name="pubscribe.classpath" refid="pubscribe.classpath.id" />
          
       </target>
   
    <target name="build" depends="init">
-    <javac srcdir="." destdir="build/classes" classpathref="hermes.classpath.id">
+    <javac srcdir="." destdir="build/classes" classpathref="pubscribe.classpath.id">
       <include name="*.java"/>
     </javac>
   </target>
   
   <target name="execute" depends="build">
-       <java classname="PubSubClient" classpathref="hermes.classpath.id"  fork="true">
+       <java classname="PubSubClient" classpathref="pubscribe.classpath.id"  fork="true">
         <arg value="${base.dir}"/>
               </java>
   </target>

Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java Mon Jun 20 08:19:44 2005
@@ -27,7 +27,6 @@
 import org.apache.ws.pubsub.Filter;
 import org.apache.ws.resource.InvalidResourceKeyException;
 import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.RemoveCallback;
 import org.apache.ws.resource.RemoveNotSupportedException;
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.ResourceKey;

Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/pubsub/Subscriber.java Mon Jun 20 08:19:44 2005
@@ -66,22 +66,22 @@
 
 public class Subscriber implements NotificationProducer {
     /**
-     * DOCUMENT_ME 
+     * DOCUMENT_ME
      */
     private static final Log LOG = LogFactory.getLog( Subscriber.class.getName() );
-    
-    private static String WRAPPED_MODE_URI = "http://incubator.apache.org/hermes/pubsub/wrapped";
+
+    private static String WRAPPED_MODE_URI = "http://ws.apache.org/ws-fx/pubscribe/pubsub/wrapped";
     private EndpointReference epr;
     private SubscriptionHome sH;
     //    private SubscriberStore store;
-    
+
     public Subscriber(String url,String configfile){
         //Axis stuff to enable Addressing HandlerChain
         AxisProperties.setProperty(EngineConfigurationFactoryDefault.OPTION_CLIENT_CONFIG_FILE,"/org/apache/ws/eventing/client-config.wsdd");
         try{
             //read jndi-config.xml
             init(configfile);
-            
+
             //create EPR TODO clean
             org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType e = org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType.Factory.newInstance();
             org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI auri = org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI.Factory.newInstance();
@@ -89,13 +89,13 @@
             e.setAddress(auri);
             //wrapper
             this.epr= new XmlBeansEndpointReference(e);
-            
+
             //getlocal SubscriptionHome from jndi-config
             Context initialContext = new InitialContext(  );
             sH = (SubscriptionHome) initialContext.lookup( SubscriptionHome.HOME_LOCATION );
-            
-            
-            
+
+
+
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -110,8 +110,8 @@
         //         XmlBeanJndiUtils.initializeFromInputStream(new java.io.FileInputStream(configfile));
         XmlBeanJndiUtils.initializeFromInputStream(Thread.currentThread().getContextClassLoader().getResourceAsStream(configfile/*XmlBeanJndiUtils.JNDI_CONFIG_FILENAME*/));
     }
-    
-    
+
+
     public org.apache.ws.pubsub.Subscription subscribe(NotificationConsumer notificationConsumer, SubscriptionEndConsumer subscriptionEndConsumer, TopicFilter tf, XPathFilter xf, Calendar initialTerminationTime, boolean UseNotify) {
         //create local Subscription
         //add to local SubscriptionHome
@@ -119,10 +119,10 @@
         Subscription ls = this.sH.create();
         ls.setNotificationConsumer(notificationConsumer);
         ls.setSubscriptionEndConsumer(subscriptionEndConsumer);
-        
+
         SubscribeDocument sdom = SubscribeDocument.Factory.newInstance();
         SubscribeDocument.Subscribe s = sdom.addNewSubscribe();
-        
+
         //create notifyTo EPR
         EndpointReferenceType nepr = (EndpointReferenceType)((XmlObjectWrapper)notificationConsumer.getEPR()).getXmlObject();
         //add ReferenceProperties
@@ -138,19 +138,19 @@
             delivery.setMode(WRAPPED_MODE_URI);
         }
 
-        
+
         //create endto EPR
         EndpointReferenceType eepr = (EndpointReferenceType)((XmlObjectWrapper)subscriptionEndConsumer.getEPR()).getXmlObject();
         //add ReferenceProperties we already created
         eepr.setReferenceProperties(refProps);
         //subscription ends are send to:
         s.setEndTo(eepr);
-        
+
         //TODO check Calendar serializing
         ExpirationType expires = ExpirationType.Factory.newInstance();
         expires.setObjectValue(initialTerminationTime);
         s.setExpires(expires);
-        
+
         //TODO multiple filters
         //XPathFilter
         if(xf!=null){
@@ -172,11 +172,11 @@
             java.io.ByteArrayOutputStream os = new java.io.ByteArrayOutputStream();
             subscribeResponse.writeTo(os);
             EnvelopeDocument sres = EnvelopeDocument.Factory.parse(new java.io.ByteArrayInputStream(os.toByteArray()));
-            
+
             //TODO handle faults
             SubscribeResponseDocument sresdom = SubscribeResponseDocument.Factory.parse(sres.getEnvelope().getBody().xmlText());
             sresres= sresdom.getSubscribeResponse();
-            
+
         }catch(Exception e){
             e.printStackTrace();
         }
@@ -185,9 +185,9 @@
         ls.setNotificationConsumer(notificationConsumer);
         return ls;
     }
-    
+
     public EndpointReference getEPR() {
         return epr;
     }
-    
+
 }

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java Mon Jun 20 08:19:44 2005
@@ -28,10 +28,8 @@
 import org.apache.ws.pubsub.Filter;
 import org.apache.ws.pubsub.NotificationConsumer;
 import org.apache.ws.pubsub.NotificationProducer;
-import org.apache.ws.resource.PersistenceCallback;
 import org.apache.ws.resource.PropertiesResource;
 import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.ResourceHome;
 import org.apache.ws.resource.ResourceKey;
 import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
@@ -251,7 +249,8 @@
             boolean removed = removeListener( topics );
 
             //persists the resource
-            if ( removed && producerResource instanceof PersistenceCallback )
+            //todo sjc --ips was this removed?
+          /*  if ( removed && producerResource instanceof PersistenceCallback )
             {
                 try
                 {
@@ -261,7 +260,9 @@
                 {
                     ;
                 }
-            }
+
+            }    */
+            //end todo sjc --ips was this removed? 
         }
 
         //notify listeners that this subscription expired.

Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/WsnWsdl2Java.java Mon Jun 20 08:19:44 2005
@@ -34,7 +34,7 @@
  */
 public class WsnWsdl2Java extends Wsdl2Java
 {
-    protected String WEBAPP_NAME = "hermes";
+    protected String WEBAPP_NAME = "pubscribe";
     private static final String VCTY_CTX_PROP_CHANGE = "propChange";
     private static final String VCTY_CTX_RESOURCE_TERMINATION = "resourceTermination";
     private static final String VCTY_CTX_NOTIF_PRODUCER = "notificationProducer";

Modified: incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/util/thread/NamedThread.java Mon Jun 20 08:19:44 2005
@@ -31,7 +31,7 @@
    extends Thread
 {
    /** all thread names will have this string as a prefix */
-   public static final String THREAD_NAME_PREFIX = "hermes.thread.";
+   public static final String THREAD_NAME_PREFIX = "pubscribe.thread.";
 
    /** number of named threads that have been created */
    private static long s_threadCount = 0L;

Modified: incubator/hermes/trunk/src/site/content/tutorial/FileSystem.wsdl
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/FileSystem.wsdl?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/FileSystem.wsdl (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/FileSystem.wsdl Mon Jun 20 08:19:44 2005
@@ -411,7 +411,7 @@
    <service name="FileSystemService">
       <!-- Note: the port name becomes the service name in the wsdd generated by Axis Wsdl2Java -->
       <port name="filesystem" binding="tns:FileSystemSoapHttpBinding">
-         <soap:address location="http://localhost:8080/hermes/services/filesystem"/>
+         <soap:address location="http://localhost:8080/pubscribe/services/filesystem"/>
       </port>
    </service>
 

Modified: incubator/hermes/trunk/src/site/content/tutorial/build.properties
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/build.properties?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/build.properties (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/build.properties Mon Jun 20 08:19:44 2005
@@ -1,9 +1,9 @@
-base.url=http://localhost:8080/hermes/services
+base.url=http://localhost:8080/pubscribe/services
 
 # Uncomment and modify the below lines if you would like to deploy to a
-# hermes webapp located somewhere other than the default location of
-# ../webapps/hermes (e.g. ${env.CATALINA_HOME}/webapps/hermes)
-hermes.webapp.dir=${env.CATALINA_HOME}/webapps/hermes
+# pubscribe webapp located somewhere other than the default location of
+# ../webapps/pubscribe (e.g. ${env.CATALINA_HOME}/webapps/pubscribe)
+pubscribe.webapp.dir=${env.CATALINA_HOME}/webapps/pubscribe
 
 # Uncomment and modify the below lines if you require a proxy to connect to external web sites
 #http.proxyHost=proxy.xyz.com

Modified: incubator/hermes/trunk/src/site/content/tutorial/build.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/build.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/build.xml (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/build.xml Mon Jun 20 08:19:44 2005
@@ -15,22 +15,22 @@
    
    <target name="init">
      
-     <available file="../../webapps/hermes" type="dir" property="dist.hermes.webapp.dir" value="../../webapps/hermes" />         
-     <condition property="hermes.webapp.dir" value="${dist.hermes.webapp.dir}">
-        <isset property="dist.hermes.webapp.dir"/>
+     <available file="../../webapps/pubscribe" type="dir" property="dist.pubscribe.webapp.dir" value="../../webapps/pubscribe" />         
+     <condition property="pubscribe.webapp.dir" value="${dist.pubscribe.webapp.dir}">
+        <isset property="dist.pubscribe.webapp.dir"/>
      </condition>     
           
-     <fail unless="hermes.webapp.dir" message="webapp dir ../../webapps/hermes does not exist." />    
-     <echo>Using webapp dir: ${hermes.webapp.dir}</echo>    
+     <fail unless="pubscribe.webapp.dir" message="webapp dir ../../webapps/pubscribe does not exist." />    
+     <echo>Using webapp dir: ${pubscribe.webapp.dir}</echo>    
      <mkdir dir="${lib.dir}" />
-     <path id="hermes.classpath.id">
-       <pathelement location="${hermes.webapp.dir}/WEB-INF/classes" />
-       <fileset dir="${hermes.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+     <path id="pubscribe.classpath.id">
+       <pathelement location="${pubscribe.webapp.dir}/WEB-INF/classes" />
+       <fileset dir="${pubscribe.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <fileset dir="${lib.dir}" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="hermes.classpath" refid="hermes.classpath.id" />
+     <property name="pubscribe.classpath" refid="pubscribe.classpath.id" />
    
    </target>
 
@@ -38,13 +38,13 @@
            depends="init"
            description="generate Axis service classes and XMLBeans types for the filesystem WSDL">      
      
-     <property name="tmp.dir" location="${hermes.webapp.dir}/_tmp_" />
+     <property name="tmp.dir" location="${pubscribe.webapp.dir}/_tmp_" />
      <mkdir dir="${tmp.dir}" />
      <copy file="${filesystem.wsdl}" todir="${tmp.dir}" overwrite="true" />         
-     <taskdef name="wsdl2Java" classname="org.apache.ws.notification.tool.WsnWsdl2JavaTask" classpath="${hermes.classpath}" />              
+     <taskdef name="wsdl2Java" classname="org.apache.ws.notification.tool.WsnWsdl2JavaTask" classpath="${pubscribe.classpath}" />              
      
      <wsdl2Java outputDir="${out.dir}"
-                classpath="${hermes.classpath}"
+                classpath="${pubscribe.classpath}"
                 debug="off"
                 proxyHost="${http.proxyHost}"
                 proxyPort="${http.proxyPort}"

Modified: incubator/hermes/trunk/src/site/content/tutorial/requests/BadGetCurrentMessage.soap
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/requests/BadGetCurrentMessage.soap?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/requests/BadGetCurrentMessage.soap (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/requests/BadGetCurrentMessage.soap Mon Jun 20 08:19:44 2005
@@ -3,7 +3,7 @@
           xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
 
    <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-      <wsa:To mustUnderstand="1">http://localhost:8080/hermes/services/filesystem</wsa:To>
+      <wsa:To mustUnderstand="1">http://localhost:8080/pubscribe/services/filesystem</wsa:To>
       <wsa:Action mustUnderstand="1">http://ws.apache.org/resource/example/filesystem/FileSystemPortType/yourWsdlRequestName</wsa:Action>
       <fs:ResourceIdentifier mustUnderstand="1">/dev/vg00/lvol1</fs:ResourceIdentifier>
    </Header>

Modified: incubator/hermes/trunk/src/site/content/tutorial/requests/GetCurrentMessage.soap
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/requests/GetCurrentMessage.soap?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/requests/GetCurrentMessage.soap (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/requests/GetCurrentMessage.soap Mon Jun 20 08:19:44 2005
@@ -3,7 +3,7 @@
           xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
 
    <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-      <wsa:To mustUnderstand="1">http://localhost:8080/hermes/services/filesystem</wsa:To>
+      <wsa:To mustUnderstand="1">http://localhost:8080/pubscribe/services/filesystem</wsa:To>
       <wsa:Action mustUnderstand="1">http://ws.apache.org/resource/example/filesystem/FileSystemPortType/yourWsdlRequestName</wsa:Action>
       <fs:ResourceIdentifier mustUnderstand="1">/dev/vg00/lvol1</fs:ResourceIdentifier>
    </Header>

Modified: incubator/hermes/trunk/src/site/content/tutorial/requests/Pause_Subscription.soap
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/requests/Pause_Subscription.soap?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/requests/Pause_Subscription.soap (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/requests/Pause_Subscription.soap Mon Jun 20 08:19:44 2005
@@ -3,8 +3,8 @@
           xmlns:sub="http://ws.apache.org/notification/base/service/SubscriptionManager">
 
    <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-      <wsa:To mustUnderstand="1">http://localhost:8080/hermes/services/SubscriptionManager</wsa:To>
-      <wsa:Action mustUnderstand="1">http://localhost:8080/hermes/services/SubscriptionManager/yourWsdlRequestName</wsa:Action>
+      <wsa:To mustUnderstand="1">http://localhost:8080/pubscribe/services/SubscriptionManager</wsa:To>
+      <wsa:Action mustUnderstand="1">http://localhost:8080/pubscribe/services/SubscriptionManager/yourWsdlRequestName</wsa:Action>
       <sub:ResourceIdentifier mustUnderstand="1">4623a820-7483-11d9-9a53-fe396408008d</sub:ResourceIdentifier>
    </Header>
 

Modified: incubator/hermes/trunk/src/site/content/tutorial/requests/Resume_Subscription.soap
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/requests/Resume_Subscription.soap?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/requests/Resume_Subscription.soap (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/requests/Resume_Subscription.soap Mon Jun 20 08:19:44 2005
@@ -3,8 +3,8 @@
           xmlns:sub="http://ws.apache.org/notification/base/service/SubscriptionManager">
 
    <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-      <wsa:To mustUnderstand="1">http://localhost:8080/hermes/services/SubscriptionManager</wsa:To>
-      <wsa:Action mustUnderstand="1">http://localhost:8080/hermes/services/SubscriptionManager/yourWsdlRequestName</wsa:Action>
+      <wsa:To mustUnderstand="1">http://localhost:8080/pubscribe/services/SubscriptionManager</wsa:To>
+      <wsa:Action mustUnderstand="1">http://localhost:8080/pubscribe/services/SubscriptionManager/yourWsdlRequestName</wsa:Action>
       <sub:ResourceIdentifier mustUnderstand="1">4623a820-7483-11d9-9a53-fe396408008d</sub:ResourceIdentifier>
    </Header>
 

Modified: incubator/hermes/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/requests/SetResourceProperties_updateMountPointProp.soap Mon Jun 20 08:19:44 2005
@@ -2,7 +2,7 @@
           xmlns:fs="http://ws.apache.org/resource/example/filesystem">
 
    <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-      <wsa:To mustUnderstand="1">http://localhost:8080/hermes/services/filesystem</wsa:To>
+      <wsa:To mustUnderstand="1">http://localhost:8080/pubscribe/services/filesystem</wsa:To>
       <wsa:Action mustUnderstand="1">http://ws.apache.org/resource/example/filesystem/FileSystemPortType/yourWsdlRequestName</wsa:Action>
       <fs:ResourceIdentifier mustUnderstand="1">/dev/vg00/lvol1</fs:ResourceIdentifier>
    </Header>

Modified: incubator/hermes/trunk/src/site/content/tutorial/requests/Subscribe_updateMountPointProp.soap
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/requests/Subscribe_updateMountPointProp.soap?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/requests/Subscribe_updateMountPointProp.soap (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/requests/Subscribe_updateMountPointProp.soap Mon Jun 20 08:19:44 2005
@@ -5,7 +5,7 @@
           >
 
    <Header>
-      <wsa:To mustUnderstand="1">http://localhost:8080/hermes/services/filesystem</wsa:To>
+      <wsa:To mustUnderstand="1">http://localhost:8080/pubscribe/services/filesystem</wsa:To>
       <wsa:Action mustUnderstand="1">http://ws.apache.org/resource/example/filesystem/FileSystemPortType/yourWsdlRequestName</wsa:Action>
       <fs:ResourceIdentifier mustUnderstand="1">/dev/vg00/lvol1</fs:ResourceIdentifier>
    </Header>
@@ -15,7 +15,7 @@
                                   
          <wsnt:ConsumerReference>
             <!-- make this filesystem for now... -->
-            <wsa:Address>http://localhost:8080/hermes/services/filesystem</wsa:Address>
+            <wsa:Address>http://localhost:8080/pubscribe/services/filesystem</wsa:Address>
 	    <wsa:ReferenceProperties/>	    			
          </wsnt:ConsumerReference>
          

Modified: incubator/hermes/trunk/src/site/content/tutorial/soapclient.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/soapclient.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/soapclient.xml (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/soapclient.xml Mon Jun 20 08:19:44 2005
@@ -12,20 +12,20 @@
 
    <target name="init">
           
-     <available file="../../webapps/hermes" type="dir" property="dist.hermes.webapp.dir" value="../../webapps/hermes" />         
-     <condition property="hermes.webapp.dir" value="${dist.hermes.webapp.dir}">
-        <isset property="dist.hermes.webapp.dir"/>
+     <available file="../../webapps/pubscribe" type="dir" property="dist.pubscribe.webapp.dir" value="../../webapps/pubscribe" />         
+     <condition property="pubscribe.webapp.dir" value="${dist.pubscribe.webapp.dir}">
+        <isset property="dist.pubscribe.webapp.dir"/>
      </condition>          
-     <fail unless="hermes.webapp.dir" message="webapp dir ../../webapps/hermes does not exist." />    
-     <echo>Using webapp dir: ${hermes.webapp.dir}</echo>         
+     <fail unless="pubscribe.webapp.dir" message="webapp dir ../../webapps/pubscribe does not exist." />    
+     <echo>Using webapp dir: ${pubscribe.webapp.dir}</echo>         
      
-     <path id="hermes.classpath.id">
-       <pathelement location="${hermes.webapp.dir}/WEB-INF/classes" />
-       <fileset dir="${hermes.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+     <path id="pubscribe.classpath.id">
+       <pathelement location="${pubscribe.webapp.dir}/WEB-INF/classes" />
+       <fileset dir="${pubscribe.webapp.dir}/WEB-INF/lib" includes="*.jar" />
        <pathelement location="${activation.jar}" />
        <pathelement location="${mail.jar}" />
      </path>
-     <property name="hermes.classpath" refid="hermes.classpath.id" />
+     <property name="pubscribe.classpath" refid="pubscribe.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="${hermes.classpath}" />              
+     <taskdef name="soapClient" classname="org.apache.ws.util.soap.SoapClientTask" classpath="${pubscribe.classpath}" />              
      <soapClient serviceURL="${url}" requestFile="${xml}" soapAction="${action}" /> 
                
    </target>

Modified: incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/BackupFrequencyCallback.java Mon Jun 20 08:19:44 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/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/CommentCallback.java Mon Jun 20 08:19:44 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/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/FsckPassNumberCallback.java Mon Jun 20 08:19:44 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/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java (original)
+++ incubator/hermes/trunk/src/site/content/tutorial/src/example/filesystem/callback/OptionsCallback.java Mon Jun 20 08:19:44 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/hermes/trunk/src/site/content/xdocs/contact_info.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/contact_info.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/contact_info.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/contact_info.xml Mon Jun 20 08:19:44 2005
@@ -6,7 +6,7 @@
 <document>
   
   <header>
-    <title>Hermes Contact Information</title>
+    <title>Pubscribe 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:hermes-dev@ws.apache.org">hermes-dev@ws.apache.&#248;rg</a>.        
+        <a href="mailto:pubscribe-dev@ws.apache.org">pubscribe-dev@ws.apache.&#248;rg</a>.        
       </p>      
       <ul>
-        <li><a href="mailto:hermes-dev-subscribe@ws.apache.org">Subscribe to List</a></li>
-        <li><a href="mailto:hermes-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=hermes-dev&amp;r=1&amp;w=2/">MARC</a></li>
+        <li><a href="mailto:pubscribe-dev-subscribe@ws.apache.org">Subscribe to List</a></li>
+        <li><a href="mailto:pubscribe-dev-unsubscribe@ws.apache.org">Unsubscribe from List</a></li>
+        <li>Archives: <a href="http://ws.apache.org/mail/pubscribe-dev/">Apache</a> , <a href="http://marc.theaimsgroup.com/?l=pubscribe-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 Hermes developers can usually be found on the 
+        The Pubscribe 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/hermes/trunk/src/site/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/index.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/index.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/index.xml Mon Jun 20 08:19:44 2005
@@ -6,7 +6,7 @@
 <document> 
 
   <header> 
-    <title>Apache WebServices - Hermes</title> 
+    <title>Apache WebServices - Pubscribe</title> 
   </header> 
 
   <body> 
@@ -14,7 +14,7 @@
     <section>
       <title>Overview</title>
       <p>
-       Hermes is a robust Java implementation of the 
+       Pubscribe is a robust Java implementation of the 
        <a href="wsn.html">Web Services Notification (WSN)</a>
        family of specifications.
       </p>
@@ -26,7 +26,7 @@
       </p>           
       <p>
        WSN builds upon the WS-ResourceFramework
-       (WSRF) family of specifications. Hermes leverages the <a href="ext:apollo/">Apollo</a>
+       (WSRF) family of specifications. Pubscribe leverages the <a href="ext:wsrf/">WSRF</a>
        project as its implementation of the WSRF foundation.                    
       </p>                   
     </section>
@@ -34,14 +34,14 @@
     <section>
       <title>News</title>
       <ul>
-         <li>(May 25, 2005) <a href="http://cvs.apache.org/dist/incubator/hermes/1.0-beta/">Hermes 1.0 Beta</a> is now available!</li> 
+         <li>(May 25, 2005) <a href="http://cvs.apache.org/dist/incubator/pubscribe/1.0-beta/">Pubscribe 1.0 Beta</a> is now available!</li> 
       </ul>
     </section>
 
     <section>
       <title>History</title>
       <p>
-       Much of the code in Hermes is based on code from the GTK4 WSRF/WSN
+       Much of the code in Pubscribe is based on code from the GTK4 WSRF/WSN
        implementation that was donated by the Globus Consortium. This code
        was refactored to make extensive use of Apache XMLBeans to
        add improved runtime schema type validation and to enable
@@ -54,7 +54,7 @@
     <section>
       <title>Incubation Disclaimer</title>  
       <p>
-        The Hermes project is an effort undergoing incubation at the Apache
+        The Pubscribe 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
@@ -64,13 +64,10 @@
         project has yet to be fully endorsed by the ASF.
       </p>      
       <p>
-        The initial proposal for Hermes is
+        The initial proposal for Pubscribe is
         <a href="http://wiki.apache.org/incubator/HermesProposal">here</a>.
       </p>      
-      <p>
-        The status of the Hermes project is tracked by the Apache incubator
-        <a href="http://incubator.apache.org/projects/hermes.html">here</a>.
-      </p>      
+  
     </section>        
     
   </body>

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

Modified: incubator/hermes/trunk/src/site/content/xdocs/manual/index.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/manual/index.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/manual/index.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/manual/index.xml Mon Jun 20 08:19:44 2005
@@ -4,11 +4,11 @@
 
 <document> 
   <header> 
-    <title>Hermes Manual</title> 
+    <title>Pubscribe Manual</title> 
   </header> 
   <body> 
     <section>
-      <title>Hermes Manual</title>
+      <title>Pubscribe Manual</title>
       <p>
         TODO
       </p>

Modified: incubator/hermes/trunk/src/site/content/xdocs/release.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/release.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/release.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/release.xml Mon Jun 20 08:19:44 2005
@@ -5,15 +5,15 @@
 <document>
   
   <header>
-    <title>Hermes - Releases</title>
+    <title>Pubscribe - Releases</title>
   </header>
   
   <body>
     <section>
        <title>v1.0 Beta</title>
        <ul>
-          <li>Download: <a href="http://cvs.apache.org/dist/incubator/hermes/1.0-beta/bin/">binary distribution</a>,         
-                        <a href="http://cvs.apache.org/dist/incubator/hermes/1.0-beta/src/">source distribution</a></li>
+          <li>Download: <a href="http://cvs.apache.org/dist/incubator/pubscribe/1.0-beta/bin/">binary distribution</a>,         
+                        <a href="http://cvs.apache.org/dist/incubator/pubscribe/1.0-beta/src/">source distribution</a></li>
        </ul>
     </section>
   </body>

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

Modified: incubator/hermes/trunk/src/site/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/site.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/site.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/site.xml Mon Jun 20 08:19:44 2005
@@ -14,7 +14,7 @@
 See http://forrest.apache.org/docs/linking.html for more info.
 -->
 
-<site label="Hermes" href="" xmlns="http://apache.org/forrest/linkmap/1.0">
+<site label="Pubscribe" href="" xmlns="http://apache.org/forrest/linkmap/1.0">
 
   <project label="Project Info">
     <overview    label="Overview"         href="index.html" />    
@@ -50,7 +50,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" />
@@ -64,7 +64,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/hermes/trunk/src/site/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/tabs.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/tabs.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/tabs.xml Mon Jun 20 08:19:44 2005
@@ -3,8 +3,8 @@
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" 
           "tab-cocoon-v10.dtd">
 
-<tabs software="Hermes"
-      title="Hermes"
+<tabs software="Pubscribe"
+      title="Pubscribe"
       copyright="The Apache Software Foundation"
       xmlns:xlink="http://www.w3.org/1999/xlink">
 

Modified: incubator/hermes/trunk/src/site/content/xdocs/tutorial/index.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/tutorial/index.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/tutorial/index.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/tutorial/index.xml Mon Jun 20 08:19:44 2005
@@ -4,7 +4,7 @@
 
 <document> 
   <header> 
-    <title>Hermes Tutorial</title> 
+    <title>Pubscribe Tutorial</title> 
   </header> 
   <body> 
     <section>

Modified: incubator/hermes/trunk/src/site/content/xdocs/version_control.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/content/xdocs/version_control.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/content/xdocs/version_control.xml (original)
+++ incubator/hermes/trunk/src/site/content/xdocs/version_control.xml Mon Jun 20 08:19:44 2005
@@ -5,7 +5,7 @@
 <document>
   
   <header>
-    <title>Hermes Version Control System</title>
+    <title>Pubscribe Version Control System</title>
   </header>
   
   <body>
@@ -13,7 +13,7 @@
     <section>
       <title>Overview</title>
       <p>
-        The Hermes source code resides in the Apache <a href="http://subversion.tigris.org/">Subversion (SVN)</a> repository.
+        The Pubscribe 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 

Modified: incubator/hermes/trunk/src/site/skinconf.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/site/skinconf.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/site/skinconf.xml (original)
+++ incubator/hermes/trunk/src/site/skinconf.xml Mon Jun 20 08:19:44 2005
@@ -58,9 +58,9 @@
 
   <!-- mandatory project logo
        skin: forrest-site renders it at the top -->
-  <project-name>Hermes</project-name>
-  <project-url>http://incubator.apache.org/hermes/</project-url>
-  <project-logo>images/hermes-logo.jpg</project-logo>
+  <project-name>Pubscribe</project-name>
+  <project-url>http://ws.apache.org/ws-fx/pubscribe/</project-url>
+  <project-logo>images/pubscribe-logo.jpg</project-logo>
 
   <!-- optional group logo
        skin: forrest-site renders it at the top-left corner -->

Modified: incubator/hermes/trunk/src/test/org/apache/ws/notification/base/impl/UnitResourceContext.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/test/org/apache/ws/notification/base/impl/UnitResourceContext.java?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/test/org/apache/ws/notification/base/impl/UnitResourceContext.java (original)
+++ incubator/hermes/trunk/src/test/org/apache/ws/notification/base/impl/UnitResourceContext.java Mon Jun 20 08:19:44 2005
@@ -103,7 +103,7 @@
     {
         try
         {
-            return new URL( "http://localhost:8080/hermes/" + m_serviceName );
+            return new URL( "http://localhost:8080/pubscribe/" + m_serviceName );
         }
         catch ( MalformedURLException murle )
         {

Modified: incubator/hermes/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt (original)
+++ incubator/hermes/trunk/src/webapp/WEB-INF/classes/example_ws-metadata_jndi_config.txt Mon Jun 20 08:19:44 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/hermes/trunk/src/webapp/index.html
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/webapp/index.html?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/src/webapp/index.html (original)
+++ incubator/hermes/trunk/src/webapp/index.html Mon Jun 20 08:19:44 2005
@@ -8,7 +8,7 @@
 
 <body bgcolor="#FFFFFF">
 
-<h1 align="center"><a href="http://ws.apache.org/ws-fx/pubscribe/"><img class="logoImage" alt="Pubscribe" src="images/hermes-logo.jpg" border="0"></a></h1>
+<h1 align="center"><a href="http://ws.apache.org/ws-fx/pubscribe/"><img class="logoImage" alt="Pubscribe" src="images/pubscribe-logo.jpg" border="0"></a></h1>
 
 <p>Hello! <em>Welcome</em> to Apache-Pubscribe.</p>
 

Modified: incubator/hermes/trunk/wse-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wse-xbeans/project.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/wse-xbeans/project.xml (original)
+++ incubator/hermes/trunk/wse-xbeans/project.xml Mon Jun 20 08:19:44 2005
@@ -11,7 +11,7 @@
   <pomVersion>3</pomVersion>
   <name>XMLBeans for the WS-Eventing spec types</name>
   <id>wse-xbeans</id>
-  <groupId>hermes</groupId>
+  <groupId>pubscribe</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>Needed for handling requests. This contains the XmlBeans-generated code from the WSA XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>

Modified: incubator/hermes/trunk/wsn-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/project.xml?rev=191490&r1=191489&r2=191490&view=diff
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/project.xml (original)
+++ incubator/hermes/trunk/wsn-xbeans/project.xml Mon Jun 20 08:19:44 2005
@@ -11,7 +11,7 @@
   <pomVersion>3</pomVersion>
   <name>XMLBeans for the WSN spec types</name>
   <id>wsn-xbeans</id>
-  <groupId>hermes</groupId>
+  <groupId>pubscribe</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>
@@ -98,10 +98,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>XMLBeans for WSRF spec types</usage>



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