incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cummi...@apache.org
Subject svn commit: r1000419 - in /incubator/aries/trunk/samples-sandbox: wordassociation-sample/ words-sample/ words-sample/wordassociation-api/ words-sample/wordassociation-assembly/ words-sample/wordassociation-datasource/ words-sample/wordassociation-jpa/ ...
Date Thu, 23 Sep 2010 12:06:27 GMT
Author: cumminsh
Date: Thu Sep 23 12:06:25 2010
New Revision: 1000419

URL: http://svn.apache.org/viewvc?rev=1000419&view=rev
Log:
ARIES-422: Correction to wordassociation assembly and refactoring of wordassociation sample to be called words sample (since it's easier to type!)

Added:
    incubator/aries/trunk/samples-sandbox/words-sample/   (props changed)
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/
    incubator/aries/trunk/samples-sandbox/words-sample/.demoscript.html.swp   (with props)
    incubator/aries/trunk/samples-sandbox/words-sample/architecture.gif   (with props)
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/   (props changed)
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-api/
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-api/src/org/apache/wordassociation/
    incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/   (props changed)
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-assembly/
    incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/   (props changed)
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-datasource/
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/   (props changed)
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-jpa/
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-jpa/src/org/apache/wordassociation/
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/   (props changed)
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-web/
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/words/
      - copied from r1000039, incubator/aries/trunk/samples-sandbox/wordassociation-sample/wordassociation-web/src/org/apache/wordassociation/
    incubator/aries/trunk/samples-sandbox/words-sample/www-wordassocation-org.gif   (with props)
Removed:
    incubator/aries/trunk/samples-sandbox/wordassociation-sample/
    incubator/aries/trunk/samples-sandbox/words-sample/wordassociation-api/
    incubator/aries/trunk/samples-sandbox/words-sample/wordassociation-assembly/
    incubator/aries/trunk/samples-sandbox/words-sample/wordassociation-datasource/
    incubator/aries/trunk/samples-sandbox/words-sample/wordassociation-jpa/
    incubator/aries/trunk/samples-sandbox/words-sample/wordassociation-web/
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/wordassociation/
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/wordassociation/
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/wordassociation/
Modified:
    incubator/aries/trunk/samples-sandbox/words-sample/demoscript.html
    incubator/aries/trunk/samples-sandbox/words-sample/pom.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/.project
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/BundleContent/META-INF/MANIFEST.MF
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/pom.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/AssociationRecorderService.java
    incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/WordGetterService.java
    incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/pom.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini
    incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/resources/createDB.sql
    incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/.project
    incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/META-INF/MANIFEST.MF
    incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/pom.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/.project
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/pom.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/MANIFEST.MF
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/persistence.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Association.java
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Recorder.java
    incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/WordLister.java
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/.project
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/META-INF/MANIFEST.MF
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/WEB-INF/web.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/pom.xml
    incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/words/web/AssociateWord.java
    incubator/aries/trunk/samples-sandbox/words-sample/xml-templates.xml

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 23 12:06:25 2010
@@ -0,0 +1 @@
+target

Added: incubator/aries/trunk/samples-sandbox/words-sample/.demoscript.html.swp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/.demoscript.html.swp?rev=1000419&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/.demoscript.html.swp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/aries/trunk/samples-sandbox/words-sample/architecture.gif
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/architecture.gif?rev=1000419&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/architecture.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/aries/trunk/samples-sandbox/words-sample/demoscript.html
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/demoscript.html?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/demoscript.html (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/demoscript.html Thu Sep 23 12:06:25 2010
@@ -72,7 +72,7 @@ a word association web app, would they? 
 <img src="www-wordassocation-org.gif" width="500"/>
 
 <p>Things can go wrong in unexpected ways in live demos, so do have a
-practice run before trying to write the wordassociation application
+practice run before trying to write the words application
 in front of other people. I've known of people who practice the live
 coding parts of their demos twenty times before a presentation, although
 that might be a bit too much preparation for most of us! The <a href="#troubleshooting">
@@ -88,8 +88,8 @@ for a demo.</p>
 <h2>Pre-demo set-up</h2>
 <h3>Assembly set-up</h3>
 
-This should be done before starting the demo. Build the wordassociation-assembly
-project using maven. The target directory provides an assembly into which the wordassociation
+This should be done before starting the demo. Build the words-assembly
+project using maven. The target directory provides an assembly into which the words
 jars can be loaded and run.
 
 
@@ -116,18 +116,18 @@ distribution and build it.) It's needed 
 <h3>Database set-up</h3>
 
 <p>This is also best done before starting the demo. The sql for creating the database will be
-found in the target directory of the wordassociation-assembly project after it has been built. 
+found in the target directory of the words-assembly project after it has been built. 
 </p>
 
 <p class="instruction">Run the following commands:
 </p>
 
-<p class="command">cd wordassociation-assembly/target
+<p class="command">cd words-assembly/target
 export CLASSPATH=$DERBY_INSTALL/lib/derby.jar:$DERBY_INSTALL/lib/derbytools.jar:.
 java org.apache.derby.tools.ij createDB.sql
 </p>
 
-<p>The wordassociation-assembly includes a datasource bundle already.
+<p>The words-assembly includes a datasource bundle already.
 This is a minor sleight-of-hand, but coding up the datasource
 in front of a live audience and ensuring it loads before the
 jpa bundle doesn't add much value pedagogically.
@@ -175,10 +175,10 @@ accept the Initialize with 'nothing' opt
 Choose <span class="menu">Add...</span> again on the Target Content
 panel, accept the 'Directory' default in the list, 
  and browse to the 
-wordassociation-assembly/target directory. Choose <span class="menu">Finish</span>.
-The wordassociation-assembly should show in the list, with 
+words-assembly/target directory. Choose <span class="menu">Finish</span>.
+The words-assembly should show in the list, with 
 around 36 plugins. (If the list of plugins is empty, 
-build the wordassociation-assembly and then choose <span class="menu">Reload</span>.
+build the words-assembly and then choose <span class="menu">Reload</span>.
 Click <span class="menu">OK</span>, and you should now 
 have a list of target platforms which includes your new platform.
 Select it so that it is checked as the default target platform.</p>
@@ -233,11 +233,28 @@ and keep clicking next until you get to 
 User Library. Create a library by clicking on the little book icon to the right 
 of the list of libraries. Click <strong>New</strong>, fill in jpa_library for the name, and click <strong>OK</strong>.
 With the new jpa_library library highlighted, click the <strong>Add jars</strong>
-button, and navigate to the geronimo-jpa_2.0_spec-1.0.jar (it will be in your wordassociation-assembly). 
+button, and navigate to the geronimo-jpa_2.0_spec-1.0.jar (it will be in your words-assembly). 
 Accept the defaults for the other parameters and finish. Then delete the eraseme project; the
 library will be saved in your workspace for re-use.
 </p>
 
+<h3>Launch configuration</h3>
+
+TODO Making a launch configuration allows the app to be launched within Eclipse.
+More instructions to come! 
+
+   7. We now have bundles we can build against, but this isn't going to help run any tests. Some of the Apache Aries bundles depend on javax.transaction. The problem is javax.transaction exists in the JVM, but only contains a few exceptions from the package which causes bundles wanting to use javax.transaction problems. to fix that we need to configure the target platform. This is fixed by going to the Arguments tab and adding the following as a vm argument:
+
+      -Dorg.osgi.framework.system.packages.extra=javax.transaction;version=1.1.0,javax.transaction.xa;version=1.1.0 -Xbootclasspath/p:${target_home}/geronimo-jta_1.1_spec-1.1.1.jar
+
+The working directory should be ${target_home}. 
+
+      This does two things. The first is it tells the OSGi framework to export the JTA packages at version 1.1, which is the version expected by Apache Aries, and the second thing it does is add the extra classes onto the JVM boot classpath.
+      Note: I added some spaces into the example to ensure it wraps on the blog. The only space that should exist when copied into the dialog is the one before -Xbootclasspath.
+
+ 
+
+TODO this can be saved and imported
 
 <h3>Set-up verification</h3>
 
@@ -246,26 +263,26 @@ This demo involves a lot of live coding,
 of things going wrong. In the event of demo accidents, it may be best
 to swap in the 'official' version of the problem jar. To confirm the
 official versions will work, and verify the assembly is correct, copy
-all the wordassociation bundles - <i>except for the datasource jar</i> - into the load directory of the wordassociation-assembly
+all the words bundles - <i>except for the datasource jar</i> - into the load directory of the words-assembly
 directory. 
 </p>
 <p class="command">
-cd wordassociation-assembly/target 
+cd words-assembly/target 
 mkdir load
-cp ../../wordassociation-api/target/*.jar load 
-cp ../../wordassociation-web/target/*.jar load 
-cp ../../wordassociation-jpa/target/*.jar load
+cp ../../words-api/target/*.jar load 
+cp ../../words-web/target/*.jar load 
+cp ../../words-jpa/target/*.jar load
 </p>
 
 <p class="instruction">
-Launch the OSGi container (from wordassociation-assembly/target). 
+Launch the OSGi container (from words-assembly/target). 
 </p>
 
 <p class="command">
 java -jar osgi-3.5.0.v20090520.jar -clean -console
 </p>
 
-<p>Confirm that <a href=http://localhost:8080/wordassociation-web/AssociateWord>http://localhost:8080/wordassociation-web/AssociateWord</a> 
+<p>Confirm that <a href=http://localhost:8080/words-web/AssociateWord>http://localhost:8080/words-web/AssociateWord</a> 
 URL works. 
 </p>
 
@@ -330,7 +347,7 @@ we'll have a bundle with interfaces. 
 </p>
 
 <p class="instruction">Right click, <b>New&rarr;Other&rarr;OSGi&rarr;OSGi Bundle project</b>.
-Fill in the name wordassociation.api and click Finish. 
+Fill in the name words.api and click Finish. 
 </p>
 
 <p class="dialogue">We're going to play a game of word assocation,
@@ -340,7 +357,7 @@ so we need a service that gives us a wor
 <p class="instruction">Right click on the newly created project, do <b>New&rarr;Interface</b>, and 
 </p>
 <p style="field">
-Package: org.apache.wordassociation
+Package: org.apache.words
 Name: WordGetterService. 
 </p>
 Add the following method:
@@ -356,7 +373,7 @@ Add the following method:
 Right click on the newly created project, do <b>New&rarr;Interface</b>, and
 </p>
 <p style="field">
-Package: org.apache.wordassociation
+Package: org.apache.words
 Name: AssociationRecorderService.
 </p>
 
@@ -375,7 +392,7 @@ Name: AssociationRecorderService.
 declare that everyone can use these interfaces. </p>
 
 <p class="instruction">Double-click on the manifest, click on the runtime tab, and click Add.
-Select the wordassociation package. Select manifest tab to show the change which has been made.</p>
+Select the words package. Select manifest tab to show the change which has been made.</p>
 
 <p class="dialogue">Making that package visible externally is just a question of adding a line in the bundle manifest. </p>
 
@@ -393,7 +410,7 @@ tool could also be used to show the bund
 <p class="dialogue">Now that we have our interfaces for our services, 
 we're going to create our web front-end.</p>
 <p class="instruction">Make the project for the web front end. Right click, New&rarr;Other&rarr;OSGi&rarr;OSGi Bundle project.
-Fill in the name wordassociation.web
+Fill in the name words-web
 Select 'OSGi Web Configuration' from the configuration drop-down.
 Click Finish.
 </p>
@@ -408,7 +425,7 @@ sure you're in the JEE perspective.)
 </p>
 
 <p class="field">
-package name: org.apache.wordassociation.web
+package name: org.apache.words.web
 <br/>
 class name: AssociateWord
 </p>
@@ -432,7 +449,7 @@ Add the package to the top-right box on 
 <p class="dialogue">We're also going to want to use our api, so we'll add that dependency now too.
 </p>
 
-<p class="instruction">Click Add, enter *word* and select the wordassociation package.
+<p class="instruction">Click Add, enter *word* and select the words package.
 Switch tabs to show the change which has been made to the manifest.
 Then navigate back to the AssociateWord class
 </p>
@@ -574,7 +591,7 @@ important.)
 <p class="instruction">To export the bundle, right click and choose
 Export&rarr;War file. Browse to the assembly load directory and choose
 an archive name. Once the export is complete, typing ss in the OSGi
-console should show the bundle. Navigating to <a href="http://localhost:8080/wordassociation.web/AssociateWord">http://localhost:8080/wordassociation.web/AssociateWord</a>
+console should show the bundle. Navigating to <a href="http://localhost:8080/words-web/AssociateWord">http://localhost:8080/words-web/AssociateWord</a>words
 should bring up a web page that reports missing dependencies.
 
 <h3>The persistence</h3>
@@ -590,8 +607,8 @@ button should be enabled.
 Select the jpa_library library you created earlier. Accept the defaults for the other parameters and finish.) 
 </p>
 
-<p class="dialogue">This new project is going to implement the wordassociation
-services, so We need to add a dependency on the wordassociation API. 
+<p class="dialogue">This new project is going to implement the words
+services, so We need to add a dependency on the words API. 
 </p>
 
 <p class="instruction">Navigate to the manifest, and add the package which comes up if you type *word* into the filter box.
@@ -612,7 +629,7 @@ in Eclipse, so we'll add an eclipse buil
 <p class="instruction">Right-click on the project, select Properties, choose Builders,
 then Import. Choose the JPA launcher you defined earlier. You should see the following message in the console following each build:
 </p>
-<p class="field" style="color: red;">132  wordassociation.jpa  INFO   [main] openjpa.Tool - No targets were given.  Running on all classes in your persistent classes list, or all metadata files in classpath directories if you have not listed your persistent classes.  Use -help to display tool usage information.
+<p class="field" style="color: red;">132  words-jpa  INFO   [main] openjpa.Tool - No targets were given.  Running on all classes in your persistent classes list, or all metadata files in classpath directories if you have not listed your persistent classes.  Use -help to display tool usage information.
 </p>
 
 <h5>Package dependencies</h5>
@@ -624,12 +641,12 @@ org.apache.openjpa.enhance, and org.apac
 Import-Package: javax.persistence,
  org.apache.openjpa.enhance,
  org.apache.openjpa.util,
- org.apache.wordassociation
+ org.apache.words
  </p>
 
 <h4>Defining the entity</h4>
 
-<p class="instruction">Create a new class called org.apache.wordassociation.jpa.Association. Add 'word' and 'associated' fields. 
+<p class="instruction">Create a new class called org.apache.words.jpa.Association. Add 'word' and 'associated' fields. 
 Right click and choose <strong>Source&rarr;Generate getters and setters</strong>. Select both word and as
 sociation, and change the insertion point to 'last member'.
 </p>
@@ -670,7 +687,7 @@ open persistence.xml. On the general tab
 class to the list of managed classes, and make sure 'exclude unlisted classes' is selected.
 Navigate to the Connection tab and fill in the following (as a JTA data source):
 </p>
-<p class="field">aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/wordassociationdb)
+<p class="field">aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/wordsdb)
 </p>
 
 <p class="dialogue">
@@ -713,10 +730,10 @@ register services declaratively in XML i
 
 <p class="instruction">Add a bean and service definition for the 
 association recorder using the <span class="template">recorder</span>
-template. You should end up with the following:</p><p class="xml">	&lt;service interface="org.apache.wordassociation.AssociationRecorderService"
+template. You should end up with the following:</p><p class="xml">	&lt;service interface="org.apache.words.AssociationRecorderService"
 		ref="recorder" /&gt;
-	&lt;bean class="org.apache.wordassociation.jpa.Recorder" id="recorder"&gt;
-		&lt;jpa:context property="entityManager" unitname="wordassociation.jpa" /&gt;
+	&lt;bean class="org.apache.words.jpa.Recorder" id="recorder"&gt;
+		&lt;jpa:context property="entityManager" unitname="words-jpa" /&gt;
 		&lt;tx:transaction method="*" value="Required" /&gt;
 	&lt;/bean&gt;
 </p>
@@ -730,7 +747,7 @@ the service. It saves typing but doesn't
 
 <h4>Defining the recorder service</h4>
 
-<p class="instruction">Define a new class org.apache.wordassociation.jpa.Recorder which
+<p class="instruction">Define a new class org.apache.words.jpa.Recorder which
 implements the AssociationRecorderService. Use the new class wizard to fill in
 stubs for the interface methods.
 
@@ -796,8 +813,8 @@ a declaration for the service using the 
 template. You should end up with the following:</p>
 
 <p class="xml">
-	&lt;service interface="org.apache.wordassociation.WordGetterService"&gt;
-		&lt;bean class="org.apache.wordassociation.jpa.WordLister" /&gt;
+	&lt;service interface="org.apache.words.WordGetterService"&gt;
+		&lt;bean class="org.apache.words.jpa.WordLister" /&gt;
 	&lt;/service&gt;
 	</p>
 
@@ -836,7 +853,7 @@ get involved by calling out word associa
 
 <p>If there's time, we can assemble our bundles into an application.
 The free tools provide support for this. Create a new project of type OSGi Enterprise
-Application, provide a name and choose Next, and then add the wordassociation bundles
+Application, provide a name and choose Next, and then add the words bundles
 to it as a contained bundles and export. 
 </p>
 

Modified: incubator/aries/trunk/samples-sandbox/words-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/pom.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/pom.xml Thu Sep 23 12:06:25 2010
@@ -24,9 +24,9 @@
         <version>0.3-incubating-SNAPSHOT</version>
     </parent>
 
-    <groupId>wordassociation</groupId>
-    <artifactId>wordassociation</artifactId>
-    <name>Apache Aries wordassociation demo</name>
+    <groupId>words</groupId>
+    <artifactId>words</artifactId>
+    <name>Apache Aries words demo</name>
     <packaging>pom</packaging>
    
      <build>
@@ -38,28 +38,28 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>wordassociation</groupId>
-                <artifactId>wordassociation-api</artifactId>
+                <groupId>words</groupId>
+                <artifactId>words-api</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>wordassociation</groupId>
-                <artifactId>wordassociation-assembly</artifactId>
+                <groupId>words</groupId>
+                <artifactId>words-assembly</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>wordassociation</groupId>
-                <artifactId>wordassociation-datasource</artifactId>
+                <groupId>words</groupId>
+                <artifactId>words-datasource</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>wordassociation</groupId>
-                <artifactId>wordassociation-jpa</artifactId>
+                <groupId>words</groupId>
+                <artifactId>words-jpa</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>wordassociation</groupId>
-                <artifactId>wordassociation-web</artifactId>
+                <groupId>words</groupId>
+                <artifactId>words-web</artifactId>
                 <version>${version}</version>
             </dependency>
         </dependencies>
@@ -67,11 +67,11 @@
 
 
     <modules>
-        <module>wordassociation-assembly</module>
-        <module>wordassociation-datasource</module>
-        <module>wordassociation-api</module>
-        <module>wordassociation-jpa</module>
-        <module>wordassociation-web</module>
+        <module>words-assembly</module>
+        <module>words-datasource</module>
+        <module>words-api</module>
+        <module>words-jpa</module>
+        <module>words-web</module>
     </modules>
 
 </project>

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/words-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 23 12:06:25 2010
@@ -0,0 +1 @@
+target

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-api/.project
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-api/.project?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-api/.project (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-api/.project Thu Sep 23 12:06:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>wordassociation.api</name>
+	<name>words-api</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-api/BundleContent/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-api/BundleContent/META-INF/MANIFEST.MF?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-api/BundleContent/META-INF/MANIFEST.MF (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-api/BundleContent/META-INF/MANIFEST.MF Thu Sep 23 12:06:25 2010
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Name: wordassociation.api
-Bundle-SymbolicName: wordassociation.api
+Bundle-Name: words-api
+Bundle-SymbolicName: words-api
 Bundle-Version: 1.0.0
 Bundle-ManifestVersion: 2
-Export-Package: org.apache.wordassociation
+Export-Package: org.apache.words
 

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-api/pom.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-api/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-api/pom.xml Thu Sep 23 12:06:25 2010
@@ -15,13 +15,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>wordassociation</groupId>
-    <artifactId>wordassociation</artifactId>
+    <groupId>words</groupId>
+    <artifactId>words</artifactId>
     <version>0.3-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>wordassociation-api</artifactId>
-  <name>Apache Aries wordassociation demo API</name>
+  <artifactId>words-api</artifactId>
+  <name>Apache Aries words demo API</name>
   <packaging>bundle</packaging>
 
   <build>
@@ -33,7 +33,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.wordassociation
+              org.apache.words
 						</Export-Package>
           </instructions>
         </configuration>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/AssociationRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/AssociationRecorderService.java?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/AssociationRecorderService.java (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/AssociationRecorderService.java Thu Sep 23 12:06:25 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wordassociation;
+package org.apache.words;
 
 /**
  * 

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/WordGetterService.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/WordGetterService.java?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/WordGetterService.java (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-api/src/org/apache/words/WordGetterService.java Thu Sep 23 12:06:25 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wordassociation;
+package org.apache.words;
 
 /**
  * 

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 23 12:06:25 2010
@@ -0,0 +1 @@
+target

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/pom.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/pom.xml Thu Sep 23 12:06:25 2010
@@ -18,13 +18,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>wordassociation</groupId>
-		<artifactId>wordassociation</artifactId>
+		<groupId>words</groupId>
+		<artifactId>words</artifactId>
 		<version>0.3-incubating-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>wordassociation-assembly</artifactId>
-	<name>Apache Aries wordassociation demo assembly</name>
+	<artifactId>words-assembly</artifactId>
+	<name>Apache Aries words demo assembly</name>
 	<packaging>pom</packaging>
 
 	<dependencies>
@@ -170,6 +170,19 @@
 			<groupId>org.apache.aries.application</groupId>
 			<artifactId>org.apache.aries.application.utils</artifactId>
 		</dependency>
+                <dependency>
+                        <groupId>org.apache.aries.application</groupId>
+                        <artifactId>org.apache.aries.application.modeller</artifactId>
+                </dependency>
+                <dependency>
+                        <groupId>org.apache.aries.application</groupId>
+                        <artifactId>org.apache.aries.application.deployment.management</artifactId>
+                </dependency>
+<dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.resolver.noop</artifactId>
+           
+        </dependency>
 
 		<!-- Additional (JPA persistence layer) Aries dependencies -->
 
@@ -214,10 +227,10 @@
 			<artifactId>org.apache.aries.transaction.wrappers</artifactId>
 		</dependency>
 		
-		<!-- Word association sample datasource -->
+		<!-- Words sample datasource -->
 		<dependency>
-			<groupId>wordassociation</groupId>
-			<artifactId>wordassociation-datasource</artifactId>
+			<groupId>words</groupId>
+			<artifactId>words-datasource</artifactId>
 		</dependency>
 		
 	</dependencies>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini Thu Sep 23 12:06:25 2010
@@ -1,211 +1,214 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-osgi.bundles=\
-cm-3.2.0-v20070116.jar@start,\
-services-3.1.200-v20070605.jar@start,\
-asm-all-3.2.jar@start,\
-pax-logging-api-1.4.jar@start,\
-pax-logging-service-1.4.jar@start,\
-derby-10.5.3.0_1.jar@start,\
-pax-web-jetty-bundle-0.7.2.jar@start,\
-pax-web-extender-war-0.7.2.jar@start,\
-pax-web-jsp-0.7.2.jar@start,\
-org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
-org.apache.aries.util-${ariesUtilVersion}.jar@start,\
-org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
-org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
-org.apache.felix.fileinstall-2.0.8.jar@start,\
-org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
-commons-collections-3.2.1.jar@start,\
-commons-lang-2.5.jar@start,\
-commons-pool-1.5.4.jar@start,\
-geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\
-geronimo-jpa_2.0_spec-1.0.jar@start,\
-geronimo-jta_1.1_spec-1.1.1.jar@start,\
-geronimo-transaction-2.1.3.jar@start,\
-openjpa-${openjpaVersion}.jar@start,\
-org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.container-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
-org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
-org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
-org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
-wordassociation.datasource-${version}.jar@start,\
-org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start
-eclipse.ignoreApp=true
-org.ops4j.pax.logging.DefaultServiceLog.level=INFO
-org.osgi.framework.system.packages=\
-javax.accessibility,\
-javax.activation,\
-javax.activity,\
-javax.annotation,\
-javax.annotation.processing,\
-javax.crypto,\
-javax.crypto.interfaces,\
-javax.crypto.spec,\
-javax.imageio,\
-javax.imageio.event,\
-javax.imageio.metadata,\
-javax.imageio.plugins.bmp,\
-javax.imageio.plugins.jpeg,\
-javax.imageio.spi,\
-javax.imageio.stream,\
-javax.jms,\
-javax.jws,\
-javax.jws.soap,\
-javax.lang.model,\
-javax.lang.model.element,\
-javax.lang.model.type,\
-javax.lang.model.util,\
-javax.management,\
-javax.management.loading,\
-javax.management.modelmbean,\
-javax.management.monitor,\
-javax.management.openmbean,\
-javax.management.relation,\
-javax.management.remote,\
-javax.management.remote.rmi,\
-javax.management.timer,\
-javax.naming,\
-javax.naming.directory,\
-javax.naming.event,\
-javax.naming.ldap,\
-javax.naming.spi,\
-javax.net,\
-javax.net.ssl,\
-javax.print,\
-javax.print.attribute,\
-javax.print.attribute.standard,\
-javax.print.event,javax.rmi,\
-javax.rmi.CORBA,\
-javax.rmi.ssl,\
-javax.script,\
-javax.security.auth,\
-javax.security.auth.callback,\
-javax.security.auth.kerberos,\
-javax.security.auth.login,\
-javax.security.auth.spi,\
-javax.security.auth.x500,\
-javax.security.cert,\
-javax.security.sasl,\
-javax.sound.midi,\
-javax.sound.midi.spi,javax.sound.sampled,\
-javax.sound.sampled.spi,\
-javax.sql,\
-javax.sql.rowset,\
-javax.sql.rowset.serial,\
-javax.sql.rowset.spi,\
-javax.swing,\
-javax.swing.border,\
-javax.swing.colorchooser,\
-javax.swing.event,\
-javax.swing.filechooser,\
-javax.swing.plaf,\
-javax.swing.plaf.basic,\
-javax.swing.plaf.metal,\
-javax.swing.plaf.multi,\
-javax.swing.plaf.synth,\
-javax.swing.table,\
-javax.swing.text,\
-javax.swing.text.html,\
-javax.swing.text.html.parser,\
-javax.swing.text.rtf,\
-javax.swing.tree,\
-javax.swing.undo,\
-javax.tools,\
-javax.xml,\
-javax.xml.bind,\
-javax.xml.bind.annotation,\
-javax.xml.bind.annotation.adapters,\
-javax.xml.bind.attachment,\
-javax.xml.bind.helpers,\
-javax.xml.bind.util,\
-javax.xml.crypto,\
-javax.xml.crypto.dom,\
-javax.xml.crypto.dsig,\
-javax.xml.crypto.dsig.dom,\
-javax.xml.crypto.dsig.keyinfo,\
-javax.xml.crypto.dsig.spec,\
-javax.xml.datatype,\
-javax.xml.namespace,\
-javax.xml.parsers,\
-javax.xml.soap,\
-javax.xml.stream,\
-javax.xml.stream.events,\
-javax.xml.stream.util,\
-javax.xml.transform,\
-javax.xml.transform.dom,\
-javax.xml.transform.sax,\
-javax.xml.transform.stax,\
-javax.xml.transform.stream,\
-javax.xml.validation,\
-javax.xml.ws,\
-javax.xml.ws.handler,\
-javax.xml.ws.handler.soap,\
-javax.xml.ws.http,\
-javax.xml.ws.soap,\
-javax.xml.ws.spi,\
-javax.xml.xpath,\
-org.ietf.jgss,\
-org.omg.CORBA,\
-org.omg.CORBA.DynAnyPackage,\
-org.omg.CORBA.ORBPackage,\
-org.omg.CORBA.TypeCodePackage,\
-org.omg.CORBA.portable,\
-org.omg.CORBA_2_3,\
-org.omg.CORBA_2_3.portable,\
-org.omg.CosNaming,\
-org.omg.CosNaming.NamingContextExtPackage,\
-org.omg.CosNaming.NamingContextPackage,\
-org.omg.Dynamic,org.omg.DynamicAny,\
-org.omg.DynamicAny.DynAnyFactoryPackage,\
-org.omg.DynamicAny.DynAnyPackage,\
-org.omg.IOP,\
-org.omg.IOP.CodecFactoryPackage,\
-org.omg.IOP.CodecPackage,\
-org.omg.Messaging,\
-org.omg.PortableInterceptor,\
-org.omg.PortableInterceptor.ORBInitInfoPackage,\
-org.omg.PortableServer,\
-org.omg.PortableServer.CurrentPackage,\
-org.omg.PortableServer.POAManagerPackage,\
-org.omg.PortableServer.POAPackage,\
-org.omg.PortableServer.ServantLocatorPackage,\
-org.omg.PortableServer.portable,\
-org.omg.SendingContext,\
-org.omg.stub.java.rmi,\
-org.w3c.dom,\
-org.w3c.dom.bootstrap,\
-org.w3c.dom.css,\
-org.w3c.dom.events,\
-org.w3c.dom.html,\
-org.w3c.dom.ls,\
-org.w3c.dom.ranges,\
-org.w3c.dom.stylesheets,\
-org.w3c.dom.traversal,\
-org.w3c.dom.views,\
-org.xml.sax,\
-org.xml.sax.ext,\
-org.xml.sax.helpers,\
-javax.transaction;partial=true;mandatory:=partial,\
-javax.transaction.xa;partial=true;mandatory:=partial
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+osgi.bundles=\
+cm-3.2.0-v20070116.jar@start,\
+services-3.1.200-v20070605.jar@start,\
+asm-all-3.2.jar@start,\
+pax-logging-api-1.4.jar@start,\
+pax-logging-service-1.4.jar@start,\
+derby-10.5.3.0_1.jar@start,\
+pax-web-jetty-bundle-0.7.2.jar@start,\
+pax-web-extender-war-0.7.2.jar@start,\
+pax-web-jsp-0.7.2.jar@start,\
+org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
+org.apache.aries.util-${ariesUtilVersion}.jar@start,\
+org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
+org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.deployment.management-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.modeller-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.resolver.noop-${ariesApplicationVersion}.jar@start,\
+org.apache.felix.fileinstall-2.0.8.jar@start,\
+org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
+commons-collections-3.2.1.jar@start,\
+commons-lang-2.5.jar@start,\
+commons-pool-1.5.4.jar@start,\
+geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\
+geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
+geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
+geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
+openjpa-${openjpaVersion}.jar@start,\
+org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
+org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
+org.apache.aries.jpa.container-${ariesJpaVersion}.jar@start,\
+org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
+org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
+org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
+org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
+words-datasource-${version}.jar@start,\
+org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start
+eclipse.ignoreApp=true
+org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
+org.osgi.framework.system.packages=\
+javax.accessibility,\
+javax.activation,\
+javax.activity,\
+javax.annotation,\
+javax.annotation.processing,\
+javax.crypto,\
+javax.crypto.interfaces,\
+javax.crypto.spec,\
+javax.imageio,\
+javax.imageio.event,\
+javax.imageio.metadata,\
+javax.imageio.plugins.bmp,\
+javax.imageio.plugins.jpeg,\
+javax.imageio.spi,\
+javax.imageio.stream,\
+javax.jms,\
+javax.jws,\
+javax.jws.soap,\
+javax.lang.model,\
+javax.lang.model.element,\
+javax.lang.model.type,\
+javax.lang.model.util,\
+javax.management,\
+javax.management.loading,\
+javax.management.modelmbean,\
+javax.management.monitor,\
+javax.management.openmbean,\
+javax.management.relation,\
+javax.management.remote,\
+javax.management.remote.rmi,\
+javax.management.timer,\
+javax.naming,\
+javax.naming.directory,\
+javax.naming.event,\
+javax.naming.ldap,\
+javax.naming.spi,\
+javax.net,\
+javax.net.ssl,\
+javax.print,\
+javax.print.attribute,\
+javax.print.attribute.standard,\
+javax.print.event,javax.rmi,\
+javax.rmi.CORBA,\
+javax.rmi.ssl,\
+javax.script,\
+javax.security.auth,\
+javax.security.auth.callback,\
+javax.security.auth.kerberos,\
+javax.security.auth.login,\
+javax.security.auth.spi,\
+javax.security.auth.x500,\
+javax.security.cert,\
+javax.security.sasl,\
+javax.sound.midi,\
+javax.sound.midi.spi,javax.sound.sampled,\
+javax.sound.sampled.spi,\
+javax.sql,\
+javax.sql.rowset,\
+javax.sql.rowset.serial,\
+javax.sql.rowset.spi,\
+javax.swing,\
+javax.swing.border,\
+javax.swing.colorchooser,\
+javax.swing.event,\
+javax.swing.filechooser,\
+javax.swing.plaf,\
+javax.swing.plaf.basic,\
+javax.swing.plaf.metal,\
+javax.swing.plaf.multi,\
+javax.swing.plaf.synth,\
+javax.swing.table,\
+javax.swing.text,\
+javax.swing.text.html,\
+javax.swing.text.html.parser,\
+javax.swing.text.rtf,\
+javax.swing.tree,\
+javax.swing.undo,\
+javax.tools,\
+javax.xml,\
+javax.xml.bind,\
+javax.xml.bind.annotation,\
+javax.xml.bind.annotation.adapters,\
+javax.xml.bind.attachment,\
+javax.xml.bind.helpers,\
+javax.xml.bind.util,\
+javax.xml.crypto,\
+javax.xml.crypto.dom,\
+javax.xml.crypto.dsig,\
+javax.xml.crypto.dsig.dom,\
+javax.xml.crypto.dsig.keyinfo,\
+javax.xml.crypto.dsig.spec,\
+javax.xml.datatype,\
+javax.xml.namespace,\
+javax.xml.parsers,\
+javax.xml.soap,\
+javax.xml.stream,\
+javax.xml.stream.events,\
+javax.xml.stream.util,\
+javax.xml.transform,\
+javax.xml.transform.dom,\
+javax.xml.transform.sax,\
+javax.xml.transform.stax,\
+javax.xml.transform.stream,\
+javax.xml.validation,\
+javax.xml.ws,\
+javax.xml.ws.handler,\
+javax.xml.ws.handler.soap,\
+javax.xml.ws.http,\
+javax.xml.ws.soap,\
+javax.xml.ws.spi,\
+javax.xml.xpath,\
+org.ietf.jgss,\
+org.omg.CORBA,\
+org.omg.CORBA.DynAnyPackage,\
+org.omg.CORBA.ORBPackage,\
+org.omg.CORBA.TypeCodePackage,\
+org.omg.CORBA.portable,\
+org.omg.CORBA_2_3,\
+org.omg.CORBA_2_3.portable,\
+org.omg.CosNaming,\
+org.omg.CosNaming.NamingContextExtPackage,\
+org.omg.CosNaming.NamingContextPackage,\
+org.omg.Dynamic,org.omg.DynamicAny,\
+org.omg.DynamicAny.DynAnyFactoryPackage,\
+org.omg.DynamicAny.DynAnyPackage,\
+org.omg.IOP,\
+org.omg.IOP.CodecFactoryPackage,\
+org.omg.IOP.CodecPackage,\
+org.omg.Messaging,\
+org.omg.PortableInterceptor,\
+org.omg.PortableInterceptor.ORBInitInfoPackage,\
+org.omg.PortableServer,\
+org.omg.PortableServer.CurrentPackage,\
+org.omg.PortableServer.POAManagerPackage,\
+org.omg.PortableServer.POAPackage,\
+org.omg.PortableServer.ServantLocatorPackage,\
+org.omg.PortableServer.portable,\
+org.omg.SendingContext,\
+org.omg.stub.java.rmi,\
+org.w3c.dom,\
+org.w3c.dom.bootstrap,\
+org.w3c.dom.css,\
+org.w3c.dom.events,\
+org.w3c.dom.html,\
+org.w3c.dom.ls,\
+org.w3c.dom.ranges,\
+org.w3c.dom.stylesheets,\
+org.w3c.dom.traversal,\
+org.w3c.dom.views,\
+org.xml.sax,\
+org.xml.sax.ext,\
+org.xml.sax.helpers,\
+javax.transaction;partial=true;mandatory:=partial,\
+javax.transaction.xa;partial=true;mandatory:=partial
+

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/resources/createDB.sql
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/resources/createDB.sql?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/resources/createDB.sql (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-assembly/src/main/resources/createDB.sql Thu Sep 23 12:06:25 2010
@@ -1,4 +1,4 @@
-connect 'jdbc:derby:wordassociationDB/;create=true';
+connect 'jdbc:derby:wordsDB/;create=true';
 CREATE TABLE ASSOCIATION (word VARCHAR(255) NOT NULL, associated VARCHAR(255), PRIMARY KEY (word));
 DELETE FROM ASSOCIATION;
 exit;

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 23 12:06:25 2010
@@ -0,0 +1 @@
+target

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/.project
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/.project?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/.project (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/.project Thu Sep 23 12:06:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>wordassociation.datasource</name>
+	<name>words-datasource</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/META-INF/MANIFEST.MF?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/META-INF/MANIFEST.MF (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/META-INF/MANIFEST.MF Thu Sep 23 12:06:25 2010
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: wordassociation.ds
-Bundle-SymbolicName: wordassociation.datasource
+Bundle-Name: words-datasource
+Bundle-SymbolicName: words-datasource
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package:  org.apache.derby.jdbc, javax.sql

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/OSGI-INF/blueprint/blueprint.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/BundleContent/OSGI-INF/blueprint/blueprint.xml Thu Sep 23 12:06:25 2010
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
   <bean id="derbyXADataSource" class="org.apache.derby.jdbc.EmbeddedXADataSource">
-    <property name="databaseName" value="wordassociationDB"/>
+    <property name="databaseName" value="wordsDB"/>
   </bean>
   
   <service id="xaDataSource" ref="derbyXADataSource" interface="javax.sql.XADataSource">
   <service-properties>
-    <entry key="osgi.jndi.service.name" value="jdbc/wordassociationdb"/>
+    <entry key="osgi.jndi.service.name" value="jdbc/wordsdb"/>
    </service-properties>
   </service>
 
   
   <bean id="derbyDataSource" class="org.apache.derby.jdbc.EmbeddedDataSource">
-    <property name="databaseName" value="wordassociationDB"/>
+    <property name="databaseName" value="wordsDB"/>
   </bean>
   
   <service ref="derbyDataSource" interface="javax.sql.DataSource">
    <service-properties>
-     <entry key="osgi.jndi.service.name" value="jdbc/wordassociationdbnojta"/>
+     <entry key="osgi.jndi.service.name" value="jdbc/wordsdbnojta"/>
    </service-properties>
   </service>
 </blueprint>
\ No newline at end of file

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/pom.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-datasource/pom.xml Thu Sep 23 12:06:25 2010
@@ -13,13 +13,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>wordassociation</groupId>
-    <artifactId>wordassociation</artifactId>
+    <groupId>words</groupId>
+    <artifactId>words</artifactId>
     <version>0.3-incubating-SNAPSHOT</version>
   </parent>
-  <groupId>wordassociation</groupId>
-  <artifactId>wordassociation-datasource</artifactId>
-  <name>Apache Aries wordassociation demo datasource</name>
+  <groupId>words</groupId>
+  <artifactId>words-datasource</artifactId>
+  <name>Apache Aries words demo datasource</name>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -59,7 +59,7 @@
               *
                         </Import-Package>
             <Private-Package>
-              wordassociation.datasource
+              words.datasource
                         </Private-Package>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
           </instructions>

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 23 12:06:25 2010
@@ -0,0 +1 @@
+target

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/.project
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/.project?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/.project (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/.project Thu Sep 23 12:06:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>wordassociation.jpa</name>
+	<name>words-jpa</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/pom.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/pom.xml Thu Sep 23 12:06:25 2010
@@ -15,14 +15,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>wordassociation</groupId>
-    <artifactId>wordassociation</artifactId>
+    <groupId>words</groupId>
+    <artifactId>words</artifactId>
     <version>0.3-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>wordassociation</groupId>
-  <artifactId>wordassociation-jpa</artifactId>
-  <name>Apache Aries wordassociation demo persistence</name>
+  <groupId>words</groupId>
+  <artifactId>words-jpa</artifactId>
+  <name>Apache Aries words demo persistence</name>
   <packaging>bundle</packaging>
 
   <build>
@@ -47,7 +47,7 @@
           <instructions>
             <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Private-Package>org.apache.wordassociation.jpa</Private-Package>
+            <Private-Package>org.apache.words.jpa</Private-Package>
           </instructions>
         </configuration>
       </plugin>
@@ -88,8 +88,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>wordassociation</groupId>
-      <artifactId>wordassociation-api</artifactId>
+      <groupId>words</groupId>
+      <artifactId>words-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/MANIFEST.MF?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/MANIFEST.MF (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/MANIFEST.MF Thu Sep 23 12:06:25 2010
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: wordassociation.jpa
-Bundle-SymbolicName: wordassociation.jpa
+Bundle-Name: words-jpa
+Bundle-SymbolicName: words-jpa
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Meta-Persistence: META-INF/persistence.xml
 Import-Package: javax.persistence,
  org.apache.openjpa.enhance,
  org.apache.openjpa.util,
- org.apache.wordassociation
+ org.apache.words

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/persistence.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/persistence.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/META-INF/persistence.xml Thu Sep 23 12:06:25 2010
@@ -2,9 +2,9 @@
 <persistence version="2.0"
 	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-	<persistence-unit name="wordassociation.jpa" transaction-type="JTA">
-		<jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/wordassociationdb)</jta-data-source>
-		<class>org.apache.wordassociation.jpa.Association</class>
+	<persistence-unit name="words-jpa" transaction-type="JTA">
+		<jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/wordsdb)</jta-data-source>
+		<class>org.apache.words.jpa.Association</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties/>
 	</persistence-unit>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/OSGI-INF/blueprint/blueprint.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/OSGI-INF/blueprint/blueprint.xml Thu Sep 23 12:06:25 2010
@@ -2,13 +2,13 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
 	xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0" xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0">
 
-	<service interface="org.apache.wordassociation.WordGetterService">
-		<bean class="org.apache.wordassociation.jpa.WordLister" />
+	<service interface="org.apache.words.WordGetterService">
+		<bean class="org.apache.words.jpa.WordLister" />
 	</service>
-	<service interface="org.apache.wordassociation.AssociationRecorderService"
+	<service interface="org.apache.words.AssociationRecorderService"
 		ref="recorder" />
-	<bean class="org.apache.wordassociation.jpa.Recorder" id="recorder">
-		<jpa:context property="entityManager" unitname="wordassociation.jpa" />
+	<bean class="org.apache.words.jpa.Recorder" id="recorder">
+		<jpa:context property="entityManager" unitname="words-jpa" />
 		<tx:transaction method="*" value="Required" />
 	</bean>
 

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Association.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Association.java?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Association.java (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Association.java Thu Sep 23 12:06:25 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wordassociation.jpa;
+package org.apache.words.jpa;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Recorder.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Recorder.java?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Recorder.java (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/Recorder.java Thu Sep 23 12:06:25 2010
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.wordassociation.jpa;
+package org.apache.words.jpa;
 
 import javax.persistence.EntityManager;
 
-import org.apache.wordassociation.AssociationRecorderService;
+import org.apache.words.AssociationRecorderService;
 
 /**
  * 

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/WordLister.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/WordLister.java?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/WordLister.java (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-jpa/src/org/apache/words/jpa/WordLister.java Thu Sep 23 12:06:25 2010
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.wordassociation.jpa;
+package org.apache.words.jpa;
 
 import java.util.Random;
 
-import org.apache.wordassociation.WordGetterService;
+import org.apache.words.WordGetterService;
 
 /**
  * 

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/words-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 23 12:06:25 2010
@@ -0,0 +1 @@
+target

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-web/.project
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-web/.project?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-web/.project (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-web/.project Thu Sep 23 12:06:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>wordassociation.web</name>
+	<name>words-web</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/META-INF/MANIFEST.MF?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/META-INF/MANIFEST.MF (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/META-INF/MANIFEST.MF Thu Sep 23 12:06:25 2010
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: wordassociation.web
-Bundle-SymbolicName: wordassociation.web
+Bundle-Name: words-web
+Bundle-SymbolicName: words-web
 Bundle-Version: 1.0.0
 Bundle-ClassPath: WEB-INF/classes
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-JSPExtractLocation: /
-Web-ContextPath: wordassociation.web
+Web-ContextPath: words-web
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
- org.apache.wordassociation,javax.naming
+ org.apache.words,javax.naming
 

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/WEB-INF/web.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/WEB-INF/web.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-web/WebContent/WEB-INF/web.xml Thu Sep 23 12:06:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>wordassociation.web</display-name>
+  <display-name>words-web</display-name>
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
     <welcome-file>index.htm</welcome-file>
@@ -13,7 +13,7 @@
     <description></description>
     <display-name>AssociateWord</display-name>
     <servlet-name>AssociateWord</servlet-name>
-    <servlet-class>org.apache.wordassociation.web.AssociateWord</servlet-class>
+    <servlet-class>org.apache.words.web.AssociateWord</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>AssociateWord</servlet-name>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-web/pom.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-web/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-web/pom.xml Thu Sep 23 12:06:25 2010
@@ -15,20 +15,20 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>wordassociation</groupId>
-    <artifactId>wordassociation</artifactId>
+    <groupId>words</groupId>
+    <artifactId>words</artifactId>
     <version>0.3-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>wordassociation</groupId>
-  <artifactId>wordassociation-web</artifactId>
-  <name>Apache Aries wordassociation demo web component</name>
+  <groupId>words</groupId>
+  <artifactId>words-web</artifactId>
+  <name>Apache Aries words demo web component</name>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>wordassociation</groupId>
-      <artifactId>wordassociation-api</artifactId>
+      <groupId>words</groupId>
+      <artifactId>words-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -56,9 +56,9 @@
           <instructions>
             <Import-Package>javax.servlet;version="2.5.0",
               javax.servlet.http;version="2.5.0",
-              org.apache.wordassociation,javax.naming</Import-Package>
-            <Private-Package>org.apache.wordassociation.web</Private-Package>
-            <Web-ContextPath>/wordassociation.web</Web-ContextPath>
+              org.apache.words,javax.naming</Import-Package>
+            <Private-Package>org.apache.words.web</Private-Package>
+            <Web-ContextPath>/words-web</Web-ContextPath>
             <Web-JSPExtractLocation>/</Web-JSPExtractLocation>
           </instructions>
         </configuration>

Modified: incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/words/web/AssociateWord.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/words/web/AssociateWord.java?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/words/web/AssociateWord.java (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/words-web/src/org/apache/words/web/AssociateWord.java Thu Sep 23 12:06:25 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.wordassociation.web;
+package org.apache.words.web;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -29,8 +29,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.wordassociation.AssociationRecorderService;
-import org.apache.wordassociation.WordGetterService;
+import org.apache.words.AssociationRecorderService;
+import org.apache.words.WordGetterService;
 
 /**
  * Servlet implementation class AssociateWord

Added: incubator/aries/trunk/samples-sandbox/words-sample/www-wordassocation-org.gif
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/www-wordassocation-org.gif?rev=1000419&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/aries/trunk/samples-sandbox/words-sample/www-wordassocation-org.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/aries/trunk/samples-sandbox/words-sample/xml-templates.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/words-sample/xml-templates.xml?rev=1000419&r1=1000039&r2=1000419&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/words-sample/xml-templates.xml (original)
+++ incubator/aries/trunk/samples-sandbox/words-sample/xml-templates.xml Thu Sep 23 12:06:25 2010
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="false" context="xml_attribute" deleted="false" description="" enabled="true" name="jpans">xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0" xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0"</template><template autoinsert="true" context="xml_tag" deleted="false" description="lister" enabled="true" name="lister">	&lt;service interface="org.apache.wordassociation.WordGetterService"&gt;
-		&lt;bean class="org.apache.wordassociation.jpa.WordLister" /&gt;
+<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="false" context="xml_attribute" deleted="false" description="" enabled="true" name="jpans">xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0" xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0"</template><template autoinsert="true" context="xml_tag" deleted="false" description="lister" enabled="true" name="lister">	&lt;service interface="org.apache.words.WordGetterService"&gt;
+		&lt;bean class="org.apache.words.jpa.WordLister" /&gt;
 	&lt;/service&gt;
-</template><template autoinsert="true" context="xml_tag" deleted="false" description="" enabled="true" name="recorder">	&lt;service interface="org.apache.wordassociation.AssociationRecorderService"
+</template><template autoinsert="true" context="xml_tag" deleted="false" description="" enabled="true" name="recorder">	&lt;service interface="org.apache.words.AssociationRecorderService"
 		ref="recorder" /&gt;
-	&lt;bean class="org.apache.wordassociation.jpa.Recorder" id="recorder"&gt;
-		&lt;jpa:context property="entityManager" unitname="wordassociation.jpa" /&gt;
+	&lt;bean class="org.apache.words.jpa.Recorder" id="recorder"&gt;
+		&lt;jpa:context property="entityManager" unitname="words-jpa" /&gt;
 		&lt;tx:transaction method="*" value="Required" /&gt;
 	&lt;/bean&gt;
 </template></templates>
\ No newline at end of file



Mime
View raw message