added run.builder and service.test projects; dbws/pom and dbws.maven/pom are parent/child
diff --git a/dbws/dbws.maven/pom.xml b/dbws/dbws.maven/pom.xml
index ca39f2a..4475018 100644
--- a/dbws/dbws.maven/pom.xml
+++ b/dbws/dbws.maven/pom.xml
@@ -6,6 +6,12 @@
<version>2.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
+ <parent>
+ <groupId>eclipselink.example.dbws</groupId>
+ <artifactId>dbws</artifactId>
+ <version>2.4.2-SNAPSHOT</version>
+ </parent>
+
<scm>
<connection>git://git.eclipse.org/gitroot/eclipselink/examples.git</connection>
<url>http://git.eclipse.org/c/eclipselink/examples.git/</url>
@@ -73,6 +79,25 @@
<build>
<defaultGoal>install</defaultGoal>
- <plugins></plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${project.basedir}/../config.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
diff --git a/dbws/dbws.simple/README.md b/dbws/dbws.simple/README.md
index 6cd9be1..bd23ce6 100644
--- a/dbws/dbws.simple/README.md
+++ b/dbws/dbws.simple/README.md
@@ -7,12 +7,19 @@
For more DBWS examples please see: http://wiki.eclipse.org/EclipseLink/Examples/DBWS
+This example consists of three phases:
+
+1. WAR generation
+2. WAR deployment
+3. Test the generated JAX-WS web service
+
+
Running the Example
-------------------
1. Download the example - Clone the examples GIT repo
-2. Configure database and application server information for use by the DBWS builder (dbws-builder.xml)
-3. Configure application server information for use by the DBWS runtime (../config.properties)
+2. Configure database and application server information for use by the DBWS builder (${project.basedir}/dbws-builder.xml)
+3. Configure application server information for use by the DBWS runtime (${examples.home}/dbws/config.properties)
The following two properties must be set according to the target application server:
- server.name
- external.txn.controller.name
@@ -29,5 +36,6 @@
- WebSphere
- org.eclipse.persistence.platform.server.was.WebSphere_7_Platform
- org.eclipse.persistence.transaction.was.WebSphereTransactionController
-4. Run the Packaging: mvn package
-5. Test the generated web service by executing 'mvn' in the service sub-directory
\ No newline at end of file
+4. Run the packaging: run.builder/mvn
+5. Deploy the generated WAR to a compatible target server
+6. Test the generated web service: service.test/mvn
\ No newline at end of file
diff --git a/dbws/dbws.simple/builder/eclipselink-dbwsutils.jar b/dbws/dbws.simple/builder/eclipselink-dbwsutils.jar
deleted file mode 100644
index 233c373..0000000
--- a/dbws/dbws.simple/builder/eclipselink-dbwsutils.jar
+++ /dev/null
Binary files differ
diff --git a/dbws/dbws.simple/builder/javax.servlet_2.4.0.v200806031604.jar b/dbws/dbws.simple/builder/javax.servlet_2.4.0.v200806031604.jar
deleted file mode 100644
index 9bc73d5..0000000
--- a/dbws/dbws.simple/builder/javax.servlet_2.4.0.v200806031604.jar
+++ /dev/null
Binary files differ
diff --git a/dbws/dbws.simple/builder/javax.wsdl_1.6.2.v201012040545.jar b/dbws/dbws.simple/builder/javax.wsdl_1.6.2.v201012040545.jar
deleted file mode 100644
index 8bb7cb3..0000000
--- a/dbws/dbws.simple/builder/javax.wsdl_1.6.2.v201012040545.jar
+++ /dev/null
Binary files differ
diff --git a/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar b/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar
deleted file mode 100644
index f311703..0000000
--- a/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar
+++ /dev/null
Binary files differ
diff --git a/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar b/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar
deleted file mode 100644
index 5bee1e3..0000000
--- a/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar
+++ /dev/null
Binary files differ
diff --git a/dbws/dbws.simple/run.builder/README.md b/dbws/dbws.simple/run.builder/README.md
new file mode 100644
index 0000000..22d6bfa
--- /dev/null
+++ b/dbws/dbws.simple/run.builder/README.md
@@ -0,0 +1,12 @@
+EclipseLink DBWS: Simple Example - Generate WAR
+===============================================
+
+EclipseLink DBWS can be used to generate a JAX-WS web service based on a very simple database schema. The DBWS builder will be used to generate a deployable WAR file based on a simple database schema.
+
+Running the DBWSBuilder
+-----------------------
+
+1. Configure database and application server information for used by the DBWS builder as outlined in ${examples.home}/dbws/dbws.simple/README.md
+2. Configure application server information for use by the DBWS runtime as outlined in ${examples.home}/dbws/dbws.simple/README.md
+3. Run the Package goal to generate the WAR file: mvn
+4. Deploy the WAR file to a compatable application server
\ No newline at end of file
diff --git a/dbws/dbws.simple/dbws-builder.xml b/dbws/dbws.simple/run.builder/dbws-builder.xml
similarity index 100%
rename from dbws/dbws.simple/dbws-builder.xml
rename to dbws/dbws.simple/run.builder/dbws-builder.xml
diff --git a/dbws/dbws.simple/pom.xml b/dbws/dbws.simple/run.builder/pom.xml
similarity index 98%
rename from dbws/dbws.simple/pom.xml
rename to dbws/dbws.simple/run.builder/pom.xml
index 3d07db5..50f03c9 100644
--- a/dbws/dbws.simple/pom.xml
+++ b/dbws/dbws.simple/run.builder/pom.xml
@@ -249,7 +249,7 @@
</goals>
<configuration>
<files>
- <file>${basedir}/../config.properties</file>
+ <file>${project.basedir}/../../config.properties</file>
</files>
</configuration>
</execution>
diff --git a/dbws/dbws.simple/src/test/java/resources/application.properties b/dbws/dbws.simple/run.builder/src/test/java/resources/application.properties
similarity index 100%
rename from dbws/dbws.simple/src/test/java/resources/application.properties
rename to dbws/dbws.simple/run.builder/src/test/java/resources/application.properties
diff --git a/dbws/dbws.simple/src/test/java/test/TestGeneration.java b/dbws/dbws.simple/run.builder/src/test/java/test/TestGeneration.java
similarity index 100%
rename from dbws/dbws.simple/src/test/java/test/TestGeneration.java
rename to dbws/dbws.simple/run.builder/src/test/java/test/TestGeneration.java
diff --git a/dbws/dbws.simple/src/test/resources/create-schema.ddl b/dbws/dbws.simple/run.builder/src/test/resources/create-schema.ddl
similarity index 100%
rename from dbws/dbws.simple/src/test/resources/create-schema.ddl
rename to dbws/dbws.simple/run.builder/src/test/resources/create-schema.ddl
diff --git a/dbws/dbws.simple/src/test/resources/drop-schema.ddl b/dbws/dbws.simple/run.builder/src/test/resources/drop-schema.ddl
similarity index 100%
rename from dbws/dbws.simple/src/test/resources/drop-schema.ddl
rename to dbws/dbws.simple/run.builder/src/test/resources/drop-schema.ddl
diff --git a/dbws/dbws.simple/service/README.md b/dbws/dbws.simple/service.test/README.md
similarity index 82%
rename from dbws/dbws.simple/service/README.md
rename to dbws/dbws.simple/service.test/README.md
index a932bc5..5d1fdef 100644
--- a/dbws/dbws.simple/service/README.md
+++ b/dbws/dbws.simple/service.test/README.md
@@ -1,5 +1,5 @@
-EclipseLink DBWS: Simple Example Service Test
-=============================================
+EclipseLink DBWS: Simple Example - Service Test
+===============================================
This test will execute a FindAll request against the generated empService.
diff --git a/dbws/dbws.simple/service/pom.xml b/dbws/dbws.simple/service.test/pom.xml
similarity index 100%
rename from dbws/dbws.simple/service/pom.xml
rename to dbws/dbws.simple/service.test/pom.xml
diff --git a/dbws/dbws.simple/service/src/test/java/dbws/EmpServiceTestSuite.java b/dbws/dbws.simple/service.test/src/test/java/dbws/EmpServiceTestSuite.java
similarity index 100%
rename from dbws/dbws.simple/service/src/test/java/dbws/EmpServiceTestSuite.java
rename to dbws/dbws.simple/service.test/src/test/java/dbws/EmpServiceTestSuite.java
diff --git a/dbws/dbws.simple/builder/install.sh b/dbws/dbws.simple/utils/builder/install.sh
similarity index 100%
rename from dbws/dbws.simple/builder/install.sh
rename to dbws/dbws.simple/utils/builder/install.sh
diff --git a/dbws/dbws-simple.sh b/dbws/dbws.simple/utils/dbws-simple.sh
similarity index 84%
rename from dbws/dbws-simple.sh
rename to dbws/dbws.simple/utils/dbws-simple.sh
index 19e2db5..1875750 100755
--- a/dbws/dbws-simple.sh
+++ b/dbws/dbws.simple/utils/dbws-simple.sh
@@ -10,7 +10,8 @@
# http://www.eclipse.org/org/documents/edl-v10.php.
#
# Contributors:
-# - egwin - May 2013 - Initial implementation
+# - egwin - May 2013 - Initial implementation
+# - dmccann - May 2013 - Modified paths since the script will live in dbws.simple
#****************************************************************************************
#==========================
@@ -35,9 +36,11 @@
unset clean
clean() {
- # Usage: createPath path
+ cd ..
mvn clean
- cd dbws.simple
+ cd dbws.maven
+ mvn clean
+ cd ../dbws.simple
mvn clean
cd service
mvn clean
@@ -45,15 +48,19 @@
unset build
build() {
- mvn
- cd dbws.simple
+ cd ..
+ mvn
+ cd dbws.maven
+ mvn
+ cd ../dbws.simple
mvn
+ echo " "
echo "**** Build complete. Deploy the generated war file, then run '$PROGNAME test'. ****"
}
unset test
test() {
- cd dbws.simple/service
+ cd service
mvn
mvn site surefire-report:report-only
}
diff --git a/dbws/pom.xml b/dbws/pom.xml
index 2f6feda..35f6936 100644
--- a/dbws/pom.xml
+++ b/dbws/pom.xml
@@ -6,6 +6,10 @@
<version>2.4.2-SNAPSHOT</version>
<packaging>pom</packaging>
+ <modules>
+ <module>dbws.maven</module>
+ </modules>
+
<scm>
<connection>git://git.eclipse.org/gitroot/eclipselink/examples.git</connection>
<url>http://git.eclipse.org/c/eclipselink/examples.git/</url>
@@ -94,6 +98,7 @@
</plugin>
<plugin>
+ <inherited>false</inherited>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
