Second commit.

bgedik · Sep 15, 2014 · 1242ec4 · 1242ec4
1 parent d5fd433
commit 1242ec4
Show file tree

Hide file tree

Showing 115 changed files with 444 additions and 199 deletions.
diff --git a/build-1.5.bat b/build-1.5.bat
diff --git a/...rc/test/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/tests/CreateXAnnotationsTest.java b/...rc/test/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/tests/CreateXAnnotationsTest.java
@@ -0,0 +1,31 @@
+package org.jvnet.hyperjaxb3.ejb.strategy.annotate.tests;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.jvnet.hyperjaxb3.ejb.strategy.annotate.CreateXAnnotations;
+
+import com.sun.java.xml.ns.persistence.orm.AttributeOverride;
+import com.sun.java.xml.ns.persistence.orm.Column;
+
+public class CreateXAnnotationsTest {
+
+	private final CreateXAnnotations createXAnnotations = new CreateXAnnotations();
+
+	@Test
+	public void createsAttributeOverrides()
+	{
+		AttributeOverride ao0 = new AttributeOverride();
+		ao0.setName("a");
+		ao0.setColumn(new Column());
+		ao0.getColumn().setName("column_a");
+		AttributeOverride ao1 = new AttributeOverride();
+		ao1.setName("b");
+		ao1.setColumn(new Column());
+		ao1.getColumn().setName("column_b");
+		List<AttributeOverride> aos = Arrays.asList(ao0, ao1);
+		Assert.assertNotNull(createXAnnotations.createAttributeOverrides(aos));
+	}
+}
diff --git a/ejb/runtime/src/main/java/org/jvnet/hyperjaxb3/xml/XMLConstants.java b/ejb/runtime/src/main/java/org/jvnet/hyperjaxb3/xml/XMLConstants.java
@@ -0,0 +1,9 @@
+package org.jvnet.hyperjaxb3.xml;
+
+public class XMLConstants {
+
+	private XMLConstants() {
+	}
+
+	public static final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
+}
diff --git a/ejb/schemas/customizations/.settings/org.eclipse.core.resources.prefs b/ejb/schemas/customizations/.settings/org.eclipse.core.resources.prefs
@@ -3,5 +3,4 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/ejb/schemas/persistence/.settings/org.eclipse.core.resources.prefs b/ejb/schemas/persistence/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/ejb/templates/basic/pom.xml b/ejb/templates/basic/pom.xml
@@ -56,10 +56,10 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
-					<execution>
+					<!--execution>
 						<id>ant-assembly</id>
 						<phase>package</phase>
-					</execution>
+					</execution-->
 					<execution>
 						<id>maven-assembly</id>
 						<phase>package</phase>
@@ -69,18 +69,18 @@
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
-					<execution>
+					<!--execution>
 						<id>ant-unpack</id>
 						<phase>pre-integration-test</phase>
-					</execution>
+					</execution-->
 					<execution>
 						<id>maven-unpack</id>
 						<phase>pre-integration-test</phase>
 					</execution>
-					<execution>
+					<!--execution>
 						<id>ant-integration-test</id>
 						<phase>integration-test</phase>
-					</execution>
+					</execution-->
 				</executions>
 			</plugin>
 			<plugin>

diff --git a/ejb/templates/basic/project-build.xml b/ejb/templates/basic/project-build.xml
@@ -4,7 +4,7 @@
 	<property name="version" value="0.5.7-SNAPSHOT"/>
 	<path id="compile.path">
 		<fileset dir="${basedir}/lib">
-			<include name="commons-lang-*.jar"/>
+			<include name="commons-lang3-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb2-basics-runtime-*.jar"/>
 
@@ -29,7 +29,7 @@
 			<include name="junit-*.jar"/>
 			<include name="jaxb2-basics-testing-*.jar"/>
 			<include name="xmlunit-*.jar"/>
-			<include name="commons-lang-*.jar"/>
+			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 
 
@@ -54,7 +54,7 @@
 			<include name="jaxb2-basics-testing-*.jar"/>
 			<include name="xmlunit-*.jar"/>
 			<include name="commons-io-*.jar"/>
-			<include name="commons-lang-*.jar"/>
+			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 			<include name="commons-collections-*.jar"/>
 			<include name="dom4j-*.jar"/>

diff --git a/ejb/templates/basic/project-pom.xml b/ejb/templates/basic/project-pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jvnet.hyperjaxb3</groupId>
 	<artifactId>hyperjaxb3-ejb-template-basic-maven</artifactId>
-	<version>0.5.7-SNAPSHOT</version>
+	<version>${project.version}</version>
 	<packaging>jar</packaging>
 	<name>Hyperjaxb3 Samples [po-initial:maven]</name>
 	<dependencies>
@@ -16,12 +16,12 @@
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
-			<version>2.2.4-1</version>
+			<version>2.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
-			<version>0.5.7-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Test dependencies -->
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-roundtrip</artifactId>
-			<version>0.5.7-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Hibernate Dependencies -->
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
+			<version>${hsqldb18.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -59,7 +59,7 @@
 			<plugin>
 				<groupId>org.jvnet.hyperjaxb3</groupId>
 				<artifactId>maven-hyperjaxb3-plugin</artifactId>
-				<version>0.5.7-SNAPSHOT</version>
+				<version>${project.version}</version>
 				<executions>
 					<execution>
 						<goals>

diff --git a/ejb/templates/pom.xml b/ejb/templates/pom.xml
@@ -2,32 +2,14 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jvnet.hyperjaxb3</groupId>
 	<artifactId>hyperjaxb3-ejb-templates</artifactId>
 	<packaging>pom</packaging>
 	<name>Hyperjaxb3 EJB Templates</name>
-	<version>0.5.7-SNAPSHOT</version>
 	<parent>
 		<groupId>org.jvnet.hyperjaxb3</groupId>
 		<artifactId>hyperjaxb3-ejb</artifactId>
 		<version>0.5.7-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>org.highsource.repository.maven2.releases</id>
-			<url>${sftp.repository.highsource.org}/maven2/releases</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>org.highsource.repository.maven2.snapshots</id>
-			<url>${sftp.repository.highsource.org}/maven2/snapshots</url>
-		</snapshotRepository>
-		<site>
-			<url>${sftp.static.highsource.org}/hyperjaxb3/hyperjaxb-ejb/hyperjaxb-ejb-templates</url>
-		</site>
-	</distributionManagement>
 	<modules>
 		<module>basic</module>
 	</modules>
@@ -80,18 +62,18 @@
 						<configuration>
 							<tasks>
 								<mkdir dir="target/test-maven-repository" />
-								<unzip src="target/${pom.artifactId}-${pom.version}-maven-src.zip" dest="${basedir}/target/test-maven-assembly" />
-								<copy todir="${basedir}/target/test-maven-assembly/${pom.artifactId}-${pom.version}/src/main/java">
+								<unzip src="target/${project.artifactId}-${project.version}-maven-src.zip" dest="${basedir}/target/test-maven-assembly" />
+								<copy todir="${basedir}/target/test-maven-assembly/${project.artifactId}-${project.version}/src/main/java">
 									<fileset dir="src/it/java">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-maven-assembly/${pom.artifactId}-${pom.version}/src/main/resources">
+								<copy todir="${basedir}/target/test-maven-assembly/${project.artifactId}-${project.version}/src/main/resources">
 									<fileset dir="src/it/resources">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-maven-assembly/${pom.artifactId}-${pom.version}/src/test/samples">
+								<copy todir="${basedir}/target/test-maven-assembly/${project.artifactId}-${project.version}/src/test/samples">
 									<fileset dir="src/it/samples">
 										<include name="**/*.*"/>
 									</fileset>
@@ -108,18 +90,18 @@
 						<phase>none</phase>
 						<configuration>
 							<tasks>
-								<unzip src="${basedir}/target/${pom.artifactId}-${pom.version}-ant-src.zip" dest="${basedir}/target/test-ant-assembly"/>
-								<copy todir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}/src/main/java">
+								<unzip src="${basedir}/target/${project.artifactId}-${project.version}-ant-src.zip" dest="${basedir}/target/test-ant-assembly"/>
+								<copy todir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}/src/main/java">
 									<fileset dir="src/it/java">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}/src/main/resources">
+								<copy todir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}/src/main/resources">
 									<fileset dir="src/it/resources">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}/src/test/samples">
+								<copy todir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}/src/test/samples">
 									<fileset dir="src/it/samples">
 										<include name="**/*.*"/>
 									</fileset>
@@ -136,7 +118,7 @@
 						<phase>none</phase>
 						<configuration>
 							<tasks>
-								<ant dir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}" target="package"/>
+								<ant dir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}" target="package"/>
 							</tasks>
 						</configuration>
 						<goals>
@@ -164,6 +146,13 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/ejb/templates/src/main/assembly/maven-src.xml b/ejb/templates/src/main/assembly/maven-src.xml
@@ -23,6 +23,7 @@
 		<file>
 			<source>${basedir}/project-pom.xml</source>
 			<destName>pom.xml</destName>
+			<filtered>true</filtered>
 		</file>
 	</files>
 </assembly>
diff --git a/ejb/tests/.gitignore b/ejb/tests/.gitignore
@@ -0,0 +1,2 @@
+/err
+/std
diff --git a/ejb/tests/addressbook/pom.xml b/ejb/tests/addressbook/pom.xml
@@ -20,7 +20,6 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/ejb/tests/ak/pom.xml b/ejb/tests/ak/pom.xml
@@ -20,7 +20,6 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/ejb/tests/annox/pom.xml b/ejb/tests/annox/pom.xml
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/ejb/tests/any/.gitignore b/ejb/tests/any/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/any/pom.xml b/ejb/tests/any/pom.xml
@@ -30,7 +30,6 @@
 			<plugin>
 				<groupId>org.jvnet.hyperjaxb3</groupId>
 				<artifactId>maven-hyperjaxb3-plugin</artifactId>
-				<version>0.5.7-SNAPSHOT</version>
 				<configuration>
 					<roundtripTestClassName>org.jvnet.hyperjaxb3.ejb.tests.any.tests.RoundtripTest</roundtripTestClassName>
 					<generateTransientId>true</generateTransientId>

diff --git a/ejb/tests/bibtexml/.gitignore b/ejb/tests/bibtexml/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/build-a-n-1.6.bat b/ejb/tests/build-a-n-1.6.bat
@@ -0,0 +1,4 @@
+setlocal
+set JAVA_HOME=%JAVA6_HOME%
+call mvn -X -Ptests-a-n clean install >std 2>err
+endlocal
diff --git a/ejb/tests/build-full-1.5.bat b/ejb/tests/build-full-1.5.bat
diff --git a/ejb/tests/build-full-1.6.bat b/ejb/tests/build-full-1.6.bat
@@ -1,4 +1,4 @@
 setlocal
 set JAVA_HOME=%JAVA6_HOME%
-call mvn -X -Ptests-a-n,tests-o-z clean install >std 2>err
+call mvn -X -Ptests-a-n,tests-o-p,tests-r-z clean install >std 2>err
 endlocal
diff --git a/ejb/tests/build-o-p-1.6.bat b/ejb/tests/build-o-p-1.6.bat
@@ -0,0 +1,4 @@
+setlocal
+set JAVA_HOME=%JAVA6_HOME%
+call mvn -X -Ptests-o-p clean install >std 2>err
+endlocal
diff --git a/ejb/tests/build-r-z-1.6.bat b/ejb/tests/build-r-z-1.6.bat
@@ -0,0 +1,4 @@
+setlocal
+set JAVA_HOME=%JAVA6_HOME%
+call mvn -X -Ptests-r-z clean install >std 2>err
+endlocal
diff --git a/ejb/tests/build-short-1.5.bat b/ejb/tests/build-short-1.5.bat
diff --git a/ejb/tests/cda/pom.xml b/ejb/tests/cda/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/ejb/tests/cu-one/.gitignore b/ejb/tests/cu-one/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/cu-one/pom.xml b/ejb/tests/cu-one/pom.xml
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/ejb/tests/custom-naming/schema/pom.xml b/ejb/tests/custom-naming/schema/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -52,7 +52,7 @@
 					<dependency>
 						<groupId>org.jvnet.hyperjaxb3</groupId>
 						<artifactId>hyperjaxb3-ejb-tests-custom-naming-extension</artifactId>
-						<version>0.5.7-SNAPSHOT</version>
+						<version>${project.version}</version>
 					</dependency>
 				</dependencies>
 			</plugin>