renamed dbws.install to dbws.maven
add MavenPackager to dbws.maven
using MavenPackager in dbws.simple
diff --git a/dbws/dbws.install/.classpath b/dbws/dbws.install/.classpath
deleted file mode 100644
index f6bb40b..0000000
--- a/dbws/dbws.install/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/dbws/dbws.install/.project b/dbws/dbws.install/.project
deleted file mode 100644
index faba9c2..0000000
--- a/dbws/dbws.install/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>dbws.install</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/dbws/dbws.install/.settings/org.eclipse.jdt.core.prefs b/dbws/dbws.install/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/dbws/dbws.install/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/dbws/dbws.maven/.classpath b/dbws/dbws.maven/.classpath
new file mode 100644
index 0000000..2b20f61
--- /dev/null
+++ b/dbws/dbws.maven/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/dbws/dbws.maven/.project b/dbws/dbws.maven/.project
new file mode 100644
index 0000000..978040e
--- /dev/null
+++ b/dbws/dbws.maven/.project
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>dbws.maven</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
diff --git a/dbws/dbws.maven/.settings/org.eclipse.core.resources.prefs b/dbws/dbws.maven/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..abdea9a
--- /dev/null
+++ b/dbws/dbws.maven/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/dbws/dbws.maven/.settings/org.eclipse.jdt.core.prefs b/dbws/dbws.maven/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..45a6e0e
--- /dev/null
+++ b/dbws/dbws.maven/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/dbws/dbws.install/.settings/org.eclipse.m2e.core.prefs b/dbws/dbws.maven/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from dbws/dbws.install/.settings/org.eclipse.m2e.core.prefs
rename to dbws/dbws.maven/.settings/org.eclipse.m2e.core.prefs
diff --git a/dbws/dbws.maven/.settings/org.eclipse.wst.common.component b/dbws/dbws.maven/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..475c6b9
--- /dev/null
+++ b/dbws/dbws.maven/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="dbws.maven">
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ </wb-module>
+</project-modules>
diff --git a/dbws/dbws.maven/.settings/org.eclipse.wst.common.project.facet.core.xml b/dbws/dbws.maven/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..a1f6907
--- /dev/null
+++ b/dbws/dbws.maven/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.5"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/dbws/dbws.install/README.md b/dbws/dbws.maven/README.md
similarity index 100%
rename from dbws/dbws.install/README.md
rename to dbws/dbws.maven/README.md
diff --git a/dbws/dbws.install/config.properties b/dbws/dbws.maven/config.properties
similarity index 100%
rename from dbws/dbws.install/config.properties
rename to dbws/dbws.maven/config.properties
diff --git a/dbws/dbws.install/pom.xml b/dbws/dbws.maven/pom.xml
similarity index 62%
rename from dbws/dbws.install/pom.xml
rename to dbws/dbws.maven/pom.xml
index 9c65e5d..ede2595 100644
--- a/dbws/dbws.install/pom.xml
+++ b/dbws/dbws.maven/pom.xml
@@ -2,9 +2,103 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>eclipselink.example.dbws</groupId>
- <artifactId>dbws.install</artifactId>
+ <artifactId>dbws.maven</artifactId>
<version>2.4.2-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
+
+ <scm>
+ <connection>git://git.eclipse.org/gitroot/eclipselink/examples.git</connection>
+ <url>http://git.eclipse.org/c/eclipselink/examples.git/</url>
+ </scm>
+
+ <licenses>
+ <license>
+ <name>EPL: Eclipse Public License</name>
+ <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ </license>
+ <license>
+ <name>EDL: Eclipse Distribution License</name>
+ <url>http://www.eclipse.org/org/documents/edl-v10.php</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Doug Clarke</name>
+ <organization>Oracle</organization>
+ <email>douglas.clarke@oracle.com</email>
+ <url>java-persistence.blogspot.com</url>
+ </developer>
+ <developer>
+ <name>Dave McCann</name>
+ <organization>Oracle</organization>
+ <email>david.mccann@oracle.com</email>
+ </developer>
+ </developers>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
+ <eclipselink.artifactid>eclipselink</eclipselink.artifactid>
+ <eclipselink.version>2.4.2-SNAPSHOT</eclipselink.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>EclipseLink</id>
+ <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>${eclipselink.groupid}</groupId>
+ <artifactId>${eclipselink.artifactid}</artifactId>
+ <version>${eclipselink.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commonj.sdo</artifactId>
+ <groupId>commonj.sdo</groupId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.24</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>oracleddlparser</artifactId>
+ <version>2.4.2-RC1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>dbws.builder</artifactId>
+ <version>2.4.2-RC1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.wsdl</artifactId>
+ <version>1.6.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<defaultGoal>install</defaultGoal>
diff --git a/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java b/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java
new file mode 100644
index 0000000..b692fff
--- /dev/null
+++ b/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * dclarke - initial
+ ******************************************************************************/
+package org.eclipse.persistence.tools.dbws;
+
+import static org.eclipse.persistence.tools.dbws.DBWSPackager.ArchiveUse.noArchive;
+
+public class MavenPackager extends IDEPackager {
+
+ public MavenPackager() {
+ super(null, "maven", noArchive);
+ srcDirname = "dbws-src";
+ publicHTMLDirname = "dbws-web";
+ }
+
+}
diff --git a/dbws/dbws.maven/src/main/resources/META-INF/services/org.eclipse.persistence.tools.dbws.DBWSPackager b/dbws/dbws.maven/src/main/resources/META-INF/services/org.eclipse.persistence.tools.dbws.DBWSPackager
new file mode 100644
index 0000000..3020f93
--- /dev/null
+++ b/dbws/dbws.maven/src/main/resources/META-INF/services/org.eclipse.persistence.tools.dbws.DBWSPackager
@@ -0,0 +1,9 @@
+org.eclipse.persistence.tools.dbws.JavasePackager
+org.eclipse.persistence.tools.dbws.WeblogicPackager
+org.eclipse.persistence.tools.dbws.WarPackager
+org.eclipse.persistence.tools.dbws.JDevPackager
+org.eclipse.persistence.tools.dbws.EclipsePackager
+org.eclipse.persistence.tools.dbws.GlassfishPackager
+org.eclipse.persistence.tools.dbws.JBossPackager
+org.eclipse.persistence.tools.dbws.WebSpherePackager
+org.eclipse.persistence.tools.dbws.MavenPackager
\ No newline at end of file
diff --git a/dbws/dbws.simple/.settings/org.eclipse.wst.common.component b/dbws/dbws.simple/.settings/org.eclipse.wst.common.component
index a973b07..0e337bd 100644
--- a/dbws/dbws.simple/.settings/org.eclipse.wst.common.component
+++ b/dbws/dbws.simple/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="dbws.simple">
- <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
- <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
- <property name="context-root" value="dbws.simple"/>
+ <dependent-module archiveName="dbws.maven-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dbws.maven/dbws.maven">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="java-output-path" value="/dbws.simple/target/classes"/>
+ <property name="context-root" value="employee.web"/>
</wb-module>
</project-modules>
diff --git a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
deleted file mode 100644
index c8e0439..0000000
--- a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<root>
- <facet id="jst.jaxrs">
- <node name="libprov">
- <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
- </node>
- </facet>
- <facet id="jst.jsf">
- <node name="libprov">
- <attribute name="provider-id" value="jsf-no-op-library-provider"/>
- </node>
- </facet>
-</root>
diff --git a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml
index 2cb0b6e..ef35f2c 100644
--- a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,8 +2,5 @@
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="wst.jsdt.web" version="1.0"/>
- <installed facet="jst.jaxrs" version="1.1"/>
<installed facet="java" version="1.7"/>
- <installed facet="jst.web" version="3.0"/>
- <installed facet="jst.jsf" version="2.0"/>
</faceted-project>
diff --git a/dbws/dbws.simple/pom.xml b/dbws/dbws.simple/pom.xml
index 2d06ae6..30d016a 100644
--- a/dbws/dbws.simple/pom.xml
+++ b/dbws/dbws.simple/pom.xml
@@ -82,31 +82,40 @@
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.24</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddlparser</artifactId>
<version>2.4.2-RC1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>dbws.builder</artifactId>
<version>2.4.2-RC1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.wsdl</artifactId>
<version>1.6.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipselink.example.dbws</groupId>
+ <artifactId>dbws.maven</artifactId>
+ <version>2.4.2-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -142,11 +151,11 @@
<mainClass>org.eclipse.persistence.tools.dbws.DBWSBuilder</mainClass>
<arguments>
<argument>-builderFile</argument>
- <argument>${project.basedir}/src/main/resources/dbws-builder.xml</argument>
+ <argument>${project.basedir}/src/main/dbws-builder.xml</argument>
<argument>-stageDir</argument>
- <argument>${project.basedir}/target</argument>
+ <argument>${project.basedir}/target/</argument>
<argument>-packageAs</argument>
- <argument>eclipse</argument>
+ <argument>maven</argument>
</arguments>
</configuration>
</execution>
diff --git a/dbws/dbws.simple/src/main/resources/dbws-builder.xml b/dbws/dbws.simple/src/main/dbws-builder.xml
similarity index 75%
rename from dbws/dbws.simple/src/main/resources/dbws-builder.xml
rename to dbws/dbws.simple/src/main/dbws-builder.xml
index d1bba71..914818f 100644
--- a/dbws/dbws.simple/src/main/resources/dbws-builder.xml
+++ b/dbws/dbws.simple/src/main/dbws-builder.xml
@@ -2,11 +2,11 @@
<dbws-builder version="1.2">
<properties>
<property name="projectName">emp</property>
- <property name="logLevel">off</property>
+ <property name="logLevel">all</property>
<property name="driver">com.mysql.jdbc.Driver</property>
<property name="url">jdbc:mysql://localhost:3306/mysql</property>
<property name="username">root</property>
<property name="password">password</property>
</properties>
- <table schemaPattern="%" tableNamePattern="%" catalogPattern="%" />
+ <table schemaPattern="%" tableNamePattern="EMPLOYEE" catalogPattern="%" />
</dbws-builder>
\ No newline at end of file
diff --git a/dbws/dbws.simple/src/main/webapp/WEB-INF/web.xml b/dbws/dbws.simple/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..18afc7c
--- /dev/null
+++ b/dbws/dbws.simple/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,2 @@
+<?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_3_0.xsd" version="3.0"/>
\ No newline at end of file
diff --git a/dbws/dbws.simple/src/test/java/test/TestGeneration.java b/dbws/dbws.simple/src/test/java/test/TestGeneration.java
new file mode 100644
index 0000000..7f8be4d
--- /dev/null
+++ b/dbws/dbws.simple/src/test/java/test/TestGeneration.java
@@ -0,0 +1,11 @@
+package test;
+
+import org.junit.Test;
+
+public class TestGeneration {
+
+ @Test
+ public void test() {
+
+ }
+}
