Fixed example for running on WebLogic
new eclipselink.example.mysports package root
diff --git a/admin.services/.classpath b/admin.services/.classpath
index edc9698..c32fd9e 100644
--- a/admin.services/.classpath
+++ b/admin.services/.classpath
@@ -6,6 +6,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resource"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
@@ -17,7 +18,7 @@
<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/JavaSE-1.6">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@@ -27,5 +28,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/admin.services/.project b/admin.services/.project
index 3da5702..892bf6c 100644
--- a/admin.services/.project
+++ b/admin.services/.project
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>admin.services</name>
+ <name>MySports Admin Services</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>
@@ -15,9 +20,17 @@
<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/admin.services/.settings/org.eclipse.jdt.core.prefs b/admin.services/.settings/org.eclipse.jdt.core.prefs
index 60105c1..443e085 100644
--- a/admin.services/.settings/org.eclipse.jdt.core.prefs
+++ b/admin.services/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/admin.services/.settings/org.eclipse.jpt.core.prefs b/admin.services/.settings/org.eclipse.jpt.core.prefs
new file mode 100644
index 0000000..716ada6
--- /dev/null
+++ b/admin.services/.settings/org.eclipse.jpt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jpt.core.platform=eclipselink2_4
+org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false
+problem.EMBEDDED_ID_CLASS_SHOULD_NOT_CONTAIN_RELATIONSHIP_MAPPINGS=error
+problem.MAPPING_INVALID_MAPPED_BY=warning
+problem.MAPS_ID_VALUE_INVALID=error
+problem.PROJECT_INACTIVE_CONNECTION=info
+problem.PROJECT_INVALID_CONNECTION=info
+problem.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_TYPE_DOES_NOT_AGREE=warning
+workspace_preferences_overriden=true
diff --git a/admin.services/.settings/org.eclipse.wst.common.component b/admin.services/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..1b08b57
--- /dev/null
+++ b/admin.services/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="MySports Admin Services">
+ <wb-resource deploy-path="/" source-path="/ejbModule" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/test/resource"/>
+ <wb-resource deploy-path="/" source-path="/src/test/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <property name="java-output-path" value="/MySports Admin Services/target/classes"/>
+ </wb-module>
+</project-modules>
diff --git a/admin.services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/admin.services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..7961132
--- /dev/null
+++ b/admin.services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jpt.jpa">
+ <node name="libprov">
+ <attribute name="provider-id" value="jpa-no-op-library-provider"/>
+ </node>
+ </facet>
+</root>
diff --git a/admin.services/.settings/org.eclipse.wst.common.project.facet.core.xml b/admin.services/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..4f901b8
--- /dev/null
+++ b/admin.services/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.7"/>
+ <installed facet="jpt.jpa" version="2.0"/>
+ <installed facet="jst.ejb" version="3.1"/>
+</faceted-project>
diff --git a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch "b/admin.services/eclipse-runconfigs/CreateDatabaseTest \0501\051.launch"
similarity index 71%
copy from admin.services/eclipse-runconfigs/TestCreateDatabase.launch
copy to "admin.services/eclipse-runconfigs/CreateDatabaseTest \0501\051.launch"
index a43b3ea..57d769e 100644
--- a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch
+++ "b/admin.services/eclipse-runconfigs/CreateDatabaseTest \0501\051.launch"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java"/>
+<listEntry value="/MySports Admin Services/src/test/java/eclipselink/example/mysports/admin/services/test/CreateDatabaseTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -11,8 +11,8 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateDatabase"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.CreateDatabaseTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MySports Admin Services"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar -Djavax.persistence.jdbc.driver=com.mysql.jdbc.Driver"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch b/admin.services/eclipse-runconfigs/CreateDatabaseTest.launch
similarity index 77%
rename from admin.services/eclipse-runconfigs/TestCreateDatabase.launch
rename to admin.services/eclipse-runconfigs/CreateDatabaseTest.launch
index a43b3ea..03bec91 100644
--- a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch
+++ b/admin.services/eclipse-runconfigs/CreateDatabaseTest.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateDatabase"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.CreateDatabaseTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateHostEnvironments.launch b/admin.services/eclipse-runconfigs/TestCreateHostEnvironments.launch
index 9f8e9fd..c2fb749 100644
--- a/admin.services/eclipse-runconfigs/TestCreateHostEnvironments.launch
+++ b/admin.services/eclipse-runconfigs/TestCreateHostEnvironments.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateHostEnvironments"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/0.0.1-SNAPSHOT/persistence-0.0.1-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch "b/admin.services/eclipse-runconfigs/TestCreateLeagues \0501\051.launch"
similarity index 73%
copy from admin.services/eclipse-runconfigs/TestCreateDatabase.launch
copy to "admin.services/eclipse-runconfigs/TestCreateLeagues \0501\051.launch"
index a43b3ea..b5c4fd8 100644
--- a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch
+++ "b/admin.services/eclipse-runconfigs/TestCreateLeagues \0501\051.launch"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java"/>
+<listEntry value="/MySports Admin Services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateLeagues.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -11,8 +11,8 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateDatabase"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateLeagues"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MySports Admin Services"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateLeagues.launch b/admin.services/eclipse-runconfigs/TestCreateLeagues.launch
index 5ef59c1..9a0482e 100644
--- a/admin.services/eclipse-runconfigs/TestCreateLeagues.launch
+++ b/admin.services/eclipse-runconfigs/TestCreateLeagues.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateLeagues"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateOrmXml.launch b/admin.services/eclipse-runconfigs/TestCreateOrmXml.launch
index 300ed40..db0f979 100644
--- a/admin.services/eclipse-runconfigs/TestCreateOrmXml.launch
+++ b/admin.services/eclipse-runconfigs/TestCreateOrmXml.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.extensions.TestCreateOrmXml"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateStyles.launch b/admin.services/eclipse-runconfigs/TestCreateStyles.launch
index f674b33..bf55ed0 100644
--- a/admin.services/eclipse-runconfigs/TestCreateStyles.launch
+++ b/admin.services/eclipse-runconfigs/TestCreateStyles.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.style.TestCreateStyles"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestHostedLeagueRepository.launch b/admin.services/eclipse-runconfigs/TestHostedLeagueRepository.launch
index 9327e29..42e3f9b 100644
--- a/admin.services/eclipse-runconfigs/TestHostedLeagueRepository.launch
+++ b/admin.services/eclipse-runconfigs/TestHostedLeagueRepository.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestHostedLeagueRepository"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch b/admin.services/eclipse-runconfigs/VerifyModelAndMappingsTest.launch
similarity index 73%
copy from admin.services/eclipse-runconfigs/TestCreateDatabase.launch
copy to admin.services/eclipse-runconfigs/VerifyModelAndMappingsTest.launch
index a43b3ea..742a440 100644
--- a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch
+++ b/admin.services/eclipse-runconfigs/VerifyModelAndMappingsTest.launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java"/>
+<listEntry value="/MySports Admin Services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappingsTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -11,8 +11,8 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateDatabase"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.VerifyModelAndMappingsTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MySports Admin Services"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/ejbModule/META-INF/MANIFEST.MF b/admin.services/ejbModule/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/admin.services/ejbModule/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
diff --git a/admin.services/pom.xml b/admin.services/pom.xml
index 799d039..0f5f666 100644
--- a/admin.services/pom.xml
+++ b/admin.services/pom.xml
@@ -42,14 +42,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>persistence</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
@@ -62,6 +54,14 @@
<version>10.9.1.0</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.22</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -109,4 +109,53 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>mysql</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.22</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.4</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>javax.persistence.jdbc.url</name>
+ <value>jdbc:mysql://localhost:3306/mysports</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.driver</name>
+ <value>com.mysql.jdbc.Driver</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.user</name>
+ <value>mysports</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.password</name>
+ <value>mysports</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/admin.services/src/main/java/eclipselink/example/mysports/admin/model/Extension.java b/admin.services/src/main/java/eclipselink/example/mysports/admin/model/Extension.java
index bd55b4a..ae9c5c9 100644
--- a/admin.services/src/main/java/eclipselink/example/mysports/admin/model/Extension.java
+++ b/admin.services/src/main/java/eclipselink/example/mysports/admin/model/Extension.java
@@ -12,6 +12,8 @@
******************************************************************************/
package eclipselink.example.mysports.admin.model;
+import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -90,11 +92,16 @@
this.columnName = columnName;
}
- public static class ID {
+ public static class ID implements Serializable {
+ private static final long serialVersionUID = 1L;
private String league;
private String type;
private String name;
+ public ID() {
+ super();
+ }
+
public ID(String league, String type, String name) {
super();
this.league = league;
diff --git a/admin.services/src/main/java/eclipselink/example/mysports/admin/services/HostedLeagueRepositoryBean.java b/admin.services/src/main/java/eclipselink/example/mysports/admin/services/HostedLeagueRepositoryBean.java
index b59be7a..684d5af 100644
--- a/admin.services/src/main/java/eclipselink/example/mysports/admin/services/HostedLeagueRepositoryBean.java
+++ b/admin.services/src/main/java/eclipselink/example/mysports/admin/services/HostedLeagueRepositoryBean.java
@@ -19,6 +19,9 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import org.eclipse.persistence.logging.SessionLog;
+import org.eclipse.persistence.sessions.server.Server;
+
import eclipselink.example.mysports.admin.model.HostedLeague;
import eclipselink.example.mysports.admin.model.Style;
@@ -50,6 +53,7 @@
}
public HostedLeague getLeague(String leagueId) {
+ getEntityManager().unwrap(Server.class).getSessionLog().log(SessionLog.FINE, "HostedLeagueRepositoryBean.getLeague::" + leagueId);
return getEntityManager().find(HostedLeague.class, leagueId);
}
diff --git a/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/Extension_.java b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/Extension_.java
new file mode 100644
index 0000000..2dcc360
--- /dev/null
+++ b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/Extension_.java
@@ -0,0 +1,15 @@
+package eclipselink.example.mysports.admin.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2013-02-22T10:11:27.052-0500")
+@StaticMetamodel(Extension.class)
+public class Extension_ {
+ public static volatile SingularAttribute<Extension, HostedLeague> league;
+ public static volatile SingularAttribute<Extension, String> type;
+ public static volatile SingularAttribute<Extension, String> name;
+ public static volatile SingularAttribute<Extension, String> javaType;
+ public static volatile SingularAttribute<Extension, String> columnName;
+}
diff --git a/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/GlassFish_.java b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/GlassFish_.java
new file mode 100644
index 0000000..c9290d3
--- /dev/null
+++ b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/GlassFish_.java
@@ -0,0 +1,9 @@
+package eclipselink.example.mysports.admin.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2013-02-22T10:11:27.055-0500")
+@StaticMetamodel(GlassFish.class)
+public class GlassFish_ extends HostEnvironment_ {
+}
diff --git a/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/HostEnvironment_.java b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/HostEnvironment_.java
new file mode 100644
index 0000000..dc99855
--- /dev/null
+++ b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/HostEnvironment_.java
@@ -0,0 +1,13 @@
+package eclipselink.example.mysports.admin.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2013-02-22T10:11:27.056-0500")
+@StaticMetamodel(HostEnvironment.class)
+public class HostEnvironment_ {
+ public static volatile SingularAttribute<HostEnvironment, Integer> id;
+ public static volatile SingularAttribute<HostEnvironment, String> name;
+ public static volatile SingularAttribute<HostEnvironment, String> description;
+}
diff --git a/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/HostedLeague_.java b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/HostedLeague_.java
new file mode 100644
index 0000000..b833d44
--- /dev/null
+++ b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/HostedLeague_.java
@@ -0,0 +1,22 @@
+package eclipselink.example.mysports.admin.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2013-02-22T10:11:27.055-0500")
+@StaticMetamodel(HostedLeague.class)
+public class HostedLeague_ {
+ public static volatile SingularAttribute<HostedLeague, String> id;
+ public static volatile SingularAttribute<HostedLeague, String> name;
+ public static volatile SingularAttribute<HostedLeague, String> colourScheme;
+ public static volatile SingularAttribute<HostedLeague, String> logoUrl;
+ public static volatile SingularAttribute<HostedLeague, String> datasourceName;
+ public static volatile SingularAttribute<HostedLeague, Boolean> shared;
+ public static volatile SingularAttribute<HostedLeague, DataIsolation> dataIsolation;
+ public static volatile ListAttribute<HostedLeague, Extension> playerExtensions;
+ public static volatile ListAttribute<HostedLeague, Extension> teamExtensions;
+ public static volatile ListAttribute<HostedLeague, Extension> divisionExtensions;
+ public static volatile SingularAttribute<HostedLeague, Long> version;
+}
diff --git a/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/Style_.java b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/Style_.java
new file mode 100644
index 0000000..b12fd68
--- /dev/null
+++ b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/Style_.java
@@ -0,0 +1,12 @@
+package eclipselink.example.mysports.admin.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2013-02-22T10:11:27.057-0500")
+@StaticMetamodel(Style.class)
+public class Style_ {
+ public static volatile SingularAttribute<Style, String> name;
+ public static volatile SingularAttribute<Style, String> css;
+}
diff --git a/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/WebLogic_.java b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/WebLogic_.java
new file mode 100644
index 0000000..284d7ec
--- /dev/null
+++ b/admin.services/src/main/jpa-modelgen/eclipselink/example/mysports/admin/model/WebLogic_.java
@@ -0,0 +1,9 @@
+package eclipselink.example.mysports.admin.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2013-02-22T10:11:27.058-0500")
+@StaticMetamodel(WebLogic.class)
+public class WebLogic_ extends HostEnvironment_ {
+}
diff --git a/admin.services/src/main/resources/META-INF/eclipselink-oxm.xml b/admin.services/src/main/resources/META-INF/eclipselink-oxm.xml
index a88b365..e1ffdc1 100644
--- a/admin.services/src/main/resources/META-INF/eclipselink-oxm.xml
+++ b/admin.services/src/main/resources/META-INF/eclipselink-oxm.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<xml-bindings version="2.3"
+<xml-bindings version="2.4"
xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm"
- package-name="example.mysports.admin.model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.eclipse.org/eclipselink/xsds/persistence/oxm http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_3.xsd">
+ package-name="eclipselink.example.mysports.admin.model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.eclipse.org/eclipselink/xsds/persistence/oxm http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_4.xsd">
<java-types>
<java-type name="HostedLeague" xml-accessor-type="FIELD" >
<xml-root-element name="league"/>
diff --git a/admin.services/src/main/resources/META-INF/persistence.xml b/admin.services/src/main/resources/META-INF/persistence.xml
index 80000a9..9384ed4 100644
--- a/admin.services/src/main/resources/META-INF/persistence.xml
+++ b/admin.services/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
<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="MySportsAdmin">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <jta-data-source>jdbc/MySportsAdmin</jta-data-source>
+ <jta-data-source>java:global/mysports</jta-data-source>
<class>eclipselink.example.mysports.admin.model.WebLogic</class>
<class>eclipselink.example.mysports.admin.model.Style</class>
<class>eclipselink.example.mysports.admin.model.Extension</class>
@@ -12,6 +12,14 @@
<validation-mode>NONE</validation-mode>
<properties>
<property name="eclipselink.weaving" value="true"/>
+ <property name="eclipselink.logging.level" value="FINE"/>
+ <property name="eclipselink.logging.timestamp" value="false"/>
+ <property name="eclipselink.logging.thread" value="false"/>
+ <property name="eclipselink.logging.session" value="false"/>
+ <property name="eclipselink.logging.exceptions" value="false"/>
+ <property name="eclipselink.logging.connection" value="false"/>
+ <property name="eclipselink.logging.level.metadata" value="WARNING"/>
+ <property name="eclipselink.logging.logger" value="DefaultLogger"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/AdminPersistenceTesting.java b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/AdminPersistenceTesting.java
index bb972be..f9a4028 100644
--- a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/AdminPersistenceTesting.java
+++ b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/AdminPersistenceTesting.java
@@ -12,13 +12,6 @@
******************************************************************************/
package eclipselink.example.mysports.admin.services.test;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL_INITIAL;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL_MIN;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL_READ;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.NON_JTA_DATASOURCE;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.TRANSACTION_TYPE;
-
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
@@ -26,6 +19,7 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.jpa.JpaHelper;
import org.eclipse.persistence.sessions.server.Server;
import org.eclipse.persistence.tools.schemaframework.DefaultTableGenerator;
@@ -35,80 +29,87 @@
import eclipselink.example.mysports.admin.examples.ExampleLeagueDefinition;
import eclipselink.example.mysports.admin.services.AdminSchemaManager;
import eclipselink.example.mysports.admin.services.HostedLeagueRepository;
-import eclipselink.example.mysports.test.common.ExamplePropertiesLoader;
public class AdminPersistenceTesting {
- public static Map<String, Object> add(Map<String, Object> properties) {
- Map<String, Object> props = properties;
+ public static Map<String, Object> add(Map<String, Object> properties) {
+ Map<String, Object> props = properties;
- if (props == null) {
- props = new HashMap<String, Object>();
- }
- props.put(TRANSACTION_TYPE, "RESOURCE_LOCAL");
- props.put(NON_JTA_DATASOURCE, "");
+ if (props == null) {
+ props = new HashMap<String, Object>();
+ }
+ // Ensure the persistence.xml provided data source are ignored for Java
+ // SE testing
+ props.put(PersistenceUnitProperties.NON_JTA_DATASOURCE, "");
+ props.put(PersistenceUnitProperties.JTA_DATASOURCE, "");
- props.put(CONNECTION_POOL_READ + CONNECTION_POOL_INITIAL, "1");
- props.put(CONNECTION_POOL_READ + CONNECTION_POOL_MIN, "1");
- props.put(CONNECTION_POOL + CONNECTION_POOL_INITIAL, "1");
- props.put(CONNECTION_POOL + CONNECTION_POOL_MIN, "1");
+ // Configure the use of embedded derby for the tests allowing system
+ // properties of the same name to override
+ setProperty(props, PersistenceUnitProperties.JDBC_DRIVER, "org.apache.derby.jdbc.EmbeddedDriver");
+ setProperty(props, PersistenceUnitProperties.JDBC_URL, "jdbc:derby:target/derby/mysports;create=true");
+ setProperty(props, PersistenceUnitProperties.JDBC_USER, "app");
+ setProperty(props, PersistenceUnitProperties.JDBC_PASSWORD, "app");
- ExamplePropertiesLoader.loadProperties(props);
+ // Ensure weaving is used
+ props.put(PersistenceUnitProperties.WEAVING, "true");
- return props;
- }
+ return props;
+ }
- public static Map<String, Object> get() {
- return add(null);
- }
+ public static Map<String, Object> get() {
+ return add(null);
+ }
- public static HostedLeagueRepository createTestRepository(
- boolean replaceSchema, boolean populate) {
- EntityManagerFactory emf = Persistence.createEntityManagerFactory(
- "MySportsAdmin", get());
- if (replaceSchema) {
- AdminSchemaManager.createTables(emf);
- }
- HostedLeagueRepository repository = (HostedLeagueRepository) Proxy
- .newProxyInstance(Thread.currentThread()
- .getContextClassLoader(),
- new Class[] { HostedLeagueRepository.class },
- new HostedLeagueRepositoryHandler(emf));
+ public static HostedLeagueRepository createTestRepository(boolean replaceSchema, boolean populate) {
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory("MySportsAdmin", get());
+ if (replaceSchema) {
+ AdminSchemaManager.createTables(emf);
+ }
+ HostedLeagueRepository repository = (HostedLeagueRepository) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] { HostedLeagueRepository.class }, new HostedLeagueRepositoryHandler(emf));
- if (populate) {
- ExampleLeagueDefinition.populateAll(repository);
- }
- return repository;
- }
+ if (populate) {
+ ExampleLeagueDefinition.populateAll(repository);
+ }
+ return repository;
+ }
- public static HostedLeagueRepository createTestRepository(
- boolean replaceSchema) {
- return createTestRepository(replaceSchema, true);
- }
+ public static HostedLeagueRepository createTestRepository(boolean replaceSchema) {
+ return createTestRepository(replaceSchema, true);
+ }
- public static EntityManagerFactory getEMF(HostedLeagueRepository repository) {
- HostedLeagueRepositoryHandler handler = (HostedLeagueRepositoryHandler) Proxy
- .getInvocationHandler(repository);
- return handler.getEmf();
- }
+ public static EntityManagerFactory getEMF(HostedLeagueRepository repository) {
+ HostedLeagueRepositoryHandler handler = (HostedLeagueRepositoryHandler) Proxy.getInvocationHandler(repository);
+ return handler.getEmf();
+ }
- public static void closeTestingRepository(
- HostedLeagueRepository repository, boolean dropTables) {
- EntityManagerFactory emf = getEMF(repository);
- if (dropTables) {
- dropTables(emf);
- }
- emf.close();
- }
+ public static void closeTestingRepository(HostedLeagueRepository repository, boolean dropTables) {
+ EntityManagerFactory emf = getEMF(repository);
+ if (dropTables) {
+ dropTables(emf);
+ }
+ emf.close();
+ }
- public static void dropTables(EntityManagerFactory emf) {
- Server session = JpaHelper.getServerSession(emf);
- SchemaManager sm = new SchemaManager(session);
+ public static void dropTables(EntityManagerFactory emf) {
+ Server session = JpaHelper.getServerSession(emf);
+ SchemaManager sm = new SchemaManager(session);
- TableCreator tc = new DefaultTableGenerator(session.getProject(), true)
- .generateDefaultTableCreator();
- tc.setIgnoreDatabaseException(true);
- tc.dropTables(session, sm, true);
- }
+ TableCreator tc = new DefaultTableGenerator(session.getProject(), true).generateDefaultTableCreator();
+ tc.setIgnoreDatabaseException(true);
+ tc.dropTables(session, sm, true);
+ }
+
+
+ /**
+ * Add the system property value if it exists, otherwise use the default
+ * value.
+ */
+ private static void setProperty(Map<String, Object> props, String key, String defaultValue) {
+ String value = defaultValue;
+ if (System.getProperties().containsKey(key)) {
+ value = System.getProperty(key);
+ }
+ props.put(key, value);
+ }
}
diff --git a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/CreateDatabaseTest.java
similarity index 98%
rename from admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java
rename to admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/CreateDatabaseTest.java
index 83cffb7..6000d01 100644
--- a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java
+++ b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/CreateDatabaseTest.java
@@ -35,7 +35,7 @@
* @author dclarke
* @since EclipseLink 2.3.0
*/
-public class TestCreateDatabase {
+public class CreateDatabaseTest {
/**
* Using EclipseLink's schema generation when the
diff --git a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateLeagues.java b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateLeagues.java
index 926788f..b06a5bc 100644
--- a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateLeagues.java
+++ b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateLeagues.java
@@ -56,7 +56,7 @@
@AfterClass
public static void closeRepository() {
- AdminPersistenceTesting.closeTestingRepository(repository, true);
+ AdminPersistenceTesting.closeTestingRepository(repository, false);
}
}
diff --git a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappings.java b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappingsTest.java
similarity index 96%
rename from admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappings.java
rename to admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappingsTest.java
index aa40df8..8bed71e 100644
--- a/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappings.java
+++ b/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/VerifyModelAndMappingsTest.java
@@ -32,7 +32,7 @@
* @author dclarke
* @since EclipseLink 2.3.0
*/
-public class VerifyModelAndMappings {
+public class VerifyModelAndMappingsTest {
@Test
public void verifySession() {
@@ -71,14 +71,14 @@
ClassDescriptor descriptor = session.getClassDescriptor(Extension.class);
Assert.assertNotNull(descriptor);
- Assert.assertTrue(descriptor.isAggregateDescriptor());
+ //Assert.assertTrue(descriptor.isAggregateDescriptor());
}
private static HostedLeagueRepository repository;
@BeforeClass
public static void createRespository() {
- repository = AdminPersistenceTesting.createTestRepository(false);
+ repository = AdminPersistenceTesting.createTestRepository(true);
}
@AfterClass
diff --git a/admin.web/.classpath b/admin.web/.classpath
index 658fc2e..96047cb 100644
--- a/admin.web/.classpath
+++ b/admin.web/.classpath
@@ -17,7 +17,9 @@
<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/JavaSE-1.6">
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <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>
diff --git a/admin.web/.project b/admin.web/.project
index 37dc1b8..ffa923d 100644
--- a/admin.web/.project
+++ b/admin.web/.project
@@ -1,23 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>admin.web</name>
+ <name>MySports Admin Web</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <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.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</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>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
diff --git a/admin.web/.settings/.jsdtscope b/admin.web/.settings/.jsdtscope
new file mode 100644
index 0000000..3a28de0
--- /dev/null
+++ b/admin.web/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
diff --git a/admin.web/.settings/org.eclipse.jdt.core.prefs b/admin.web/.settings/org.eclipse.jdt.core.prefs
index 60105c1..4ede96d 100644
--- a/admin.web/.settings/org.eclipse.jdt.core.prefs
+++ b/admin.web/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,2 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/admin.web/.settings/org.eclipse.m2e.core.prefs b/admin.web/.settings/org.eclipse.m2e.core.prefs
index f897a7f..2af59a6 100644
--- a/admin.web/.settings/org.eclipse.m2e.core.prefs
+++ b/admin.web/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
-activeProfiles=
+activeProfiles=mysql
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
diff --git a/admin.web/.settings/org.eclipse.wst.common.component b/admin.web/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..897efab
--- /dev/null
+++ b/admin.web/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="MySports Admin Web">
+ <wb-resource deploy-path="/" source-path="/WebContent" 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"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+ <property name="java-output-path" value="/MySports Admin Web/target/classes"/>
+ <property name="context-root" value="mysportsadmin"/>
+ </wb-module>
+</project-modules>
diff --git a/admin.web/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/admin.web/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..c32233e
--- /dev/null
+++ b/admin.web/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+ </node>
+ </facet>
+</root>
diff --git a/admin.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/admin.web/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..4f73bdc
--- /dev/null
+++ b/admin.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.7"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="jst.jsf" version="2.1"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/admin.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/admin.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/admin.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/admin.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/admin.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/admin.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/admin.web/pom.xml b/admin.web/pom.xml
index b986788..a4a2816 100644
--- a/admin.web/pom.xml
+++ b/admin.web/pom.xml
@@ -39,10 +39,10 @@
<version>6.0</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>persistence</artifactId>
+ <artifactId>admin.services</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -59,18 +59,21 @@
</dependencies>
<build>
- <finalName>admin.web</finalName>
-
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+
</plugins>
</build>
</project>
diff --git a/admin.web/src/main/java/eclipselink/example/mysports/admin/jaxrs/HostedLeaguesService.java b/admin.web/src/main/java/eclipselink/example/mysports/admin/jaxrs/HostedLeaguesService.java
index f7c8f76..7fb968a 100644
--- a/admin.web/src/main/java/eclipselink/example/mysports/admin/jaxrs/HostedLeaguesService.java
+++ b/admin.web/src/main/java/eclipselink/example/mysports/admin/jaxrs/HostedLeaguesService.java
@@ -18,15 +18,12 @@
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
-import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import eclipselink.example.mysports.admin.model.HostedLeague;
@@ -44,68 +41,63 @@
@Path("league")
public class HostedLeaguesService {
- @EJB
- private HostedLeagueRepository repository;
+ @EJB
+ private HostedLeagueRepository repository;
- public HostedLeagueRepository getRepository() {
- return repository;
- }
+ public HostedLeagueRepository getRepository() {
+ return repository;
+ }
- public void setRepository(HostedLeagueRepository repository) {
- this.repository = repository;
- }
+ public void setRepository(HostedLeagueRepository repository) {
+ this.repository = repository;
+ }
- @GET
- @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- public List<HostedLeague> allLeagues(@Context UriInfo context) {
- List<HostedLeague> allLeagues = getRepository().allSharedLeagues();
+ @GET
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+ public List<HostedLeague> allLeagues(@Context UriInfo context) {
+ List<HostedLeague> allLeagues = getRepository().allSharedLeagues();
- for (HostedLeague hl : allLeagues) {
- hl.setUri(context.getAbsolutePath() + "/" + hl.getId());
- }
- return allLeagues;
- }
+ for (HostedLeague hl : allLeagues) {
+ hl.setUri(context.getAbsolutePath() + "/" + hl.getId());
+ }
+ return allLeagues;
+ }
- @GET
- @Path("{league}")
- @Produces(MediaType.APPLICATION_XML)
- public HostedLeague getLeague(@Context UriInfo context,
- @PathParam("league") String leagueId) {
- HostedLeague league = getRepository().getLeague(leagueId);
- if (league != null && context != null) {
- league.setUri(context.getAbsolutePath() + "/" + league.getId());
- }
- return league;
+ @GET
+ @Path("{league}")
+ @Produces(MediaType.APPLICATION_XML)
+ public HostedLeague getLeague(@Context UriInfo context, @PathParam("league") String leagueId) {
+ System.err.println("HostedLeagueService::GET/"+leagueId);
+ HostedLeague league = getRepository().getLeague(leagueId);
+ if (league != null && context != null) {
+ league.setUri(context.getAbsolutePath() + "/" + league.getId());
+ }
+ return league;
- }
+ }
- @POST
- public Response create(@FormParam("league-id") String id,
- @FormParam("league-name") String name,
- @FormParam("colour-scheme") String scheme) {
- getRepository().merge(new HostedLeague(id, name, scheme));
- return Response.status(Response.Status.CREATED).build();
- }
+ @GET
+ @Path("{league}/orm")
+ @Produces(MediaType.APPLICATION_XML)
+ public String getORM(@PathParam("league") String leagueId) {
+ System.err.println("HostedLeagueService::orm-GET/"+leagueId);
+ return getRepository().getORM(leagueId);
+ }
- @GET
- @Path("{league}/orm")
- @Produces(MediaType.APPLICATION_XML)
- public String getORM(@PathParam("league") String leagueId) {
- return getRepository().getORM(leagueId);
- }
+ @GET
+ @Path("{league}.css")
+ @Produces("text/css")
+ public String getCSS(@PathParam("league") String leagueId) {
+ System.err.println("HostedLeagueService::css-GET/"+leagueId);
+ return getRepository().getCSS(leagueId);
+ }
- @GET
- @Path("{league}.css")
- @Produces("text/css")
- public String getCSS(@PathParam("league") String leagueId) {
- return getRepository().getCSS(leagueId);
- }
-
- @GET
- @Path("{league}.png")
- @Produces("image/jpeg")
- public InputStream getLogo(@PathParam("league") String leagueId) {
- return getRepository().getLogo(leagueId);
- }
+ @GET
+ @Path("{league}.png")
+ @Produces("image/jpeg")
+ public InputStream getLogo(@PathParam("league") String leagueId) {
+ System.err.println("HostedLeagueService::logo-GET/"+leagueId);
+ return getRepository().getLogo(leagueId);
+ }
}
\ No newline at end of file
diff --git a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/CreateLeague.java b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/CreateLeague.java
index bbcae0d..7ca5b96 100644
--- a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/CreateLeague.java
+++ b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/CreateLeague.java
@@ -14,6 +14,7 @@
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.RequestScoped;
import eclipselink.example.mysports.admin.model.HostedLeague;
@@ -24,6 +25,7 @@
* @since EclipseLink 2.4
*/
@ManagedBean
+@RequestScoped
public class CreateLeague {
private HostedLeague league = new HostedLeague("", "", "default");
diff --git a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/DatasourceRepositoryBean.java b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/DatasourceRepositoryBean.java
index 0ab2548..b8cea6d 100644
--- a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/DatasourceRepositoryBean.java
+++ b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/DatasourceRepositoryBean.java
@@ -16,12 +16,14 @@
import java.util.List;
import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
import eclipselink.example.mysports.admin.model.Datasource;
import eclipselink.example.mysports.admin.services.glassfish.JDBCResource;
import eclipselink.example.mysports.admin.services.glassfish.RESTOperations;
@ManagedBean
+@RequestScoped
public class DatasourceRepositoryBean {
private List<Datasource> datasources;
diff --git a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/HostEnvironmentRepositoryBean.java b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/HostEnvironmentRepositoryBean.java
index c52ba58..e899880 100644
--- a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/HostEnvironmentRepositoryBean.java
+++ b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/HostEnvironmentRepositoryBean.java
@@ -15,12 +15,14 @@
import java.util.List;
import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
import javax.inject.Inject;
import eclipselink.example.mysports.admin.model.HostEnvironment;
import eclipselink.example.mysports.admin.services.HostEnvironmentRepository;
@ManagedBean
+@RequestScoped
public class HostEnvironmentRepositoryBean {
@Inject
diff --git a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/ViewLeague.java b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/ViewLeague.java
index e1b8af8..6a59379 100644
--- a/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/ViewLeague.java
+++ b/admin.web/src/main/java/eclipselink/example/mysports/admin/jsf/ViewLeague.java
@@ -26,7 +26,7 @@
import eclipselink.example.mysports.admin.model.HostedLeague;
/**
- *
+ * TODO
*
* @author dclarke
* @since EclipseLink 2.4
diff --git a/admin.web/src/main/webapp/WEB-INF/faces-config.xml b/admin.web/src/main/webapp/WEB-INF/faces-config.xml
index 841373a..0639996 100644
--- a/admin.web/src/main/webapp/WEB-INF/faces-config.xml
+++ b/admin.web/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,54 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
- version="2.0">
-
- <managed-bean>
- <managed-bean-name>leagueRepository</managed-bean-name>
- <managed-bean-class>eclipselink.example.mysports.admin.jsf.LeagueRepository</managed-bean-class>
-
- <managed-bean-scope>session</managed-bean-scope></managed-bean>
-
- <managed-bean>
- <managed-bean-name>createLeague</managed-bean-name>
- <managed-bean-class>eclipselink.example.mysports.admin.jsf.CreateLeague</managed-bean-class>
-
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>repository</property-name>
- <property-class>example.mysports.admin.jsf.LeagueRepository</property-class>
- <value>#{leagueRepository}</value>
- </managed-property>
- <managed-property>
- <property-name>viewLeague</property-name>
- <property-class>example.mysports.admin.jsf.ViewLeague</property-class>
- <value>#{viewLeague}</value>
- </managed-property></managed-bean>
-
- <managed-bean>
- <managed-bean-name>viewLeague</managed-bean-name>
- <managed-bean-class>eclipselink.example.mysports.admin.jsf.ViewLeague</managed-bean-class>
-
- <managed-bean-scope>session</managed-bean-scope>
- <managed-property>
- <property-name>repository</property-name>
- <property-class>example.mysports.admin.jsf.LeagueRepository</property-class>
- <value>#{leagueRepository}</value>
- </managed-property></managed-bean>
- <managed-bean>
- <managed-bean-name>datasourceRepository</managed-bean-name>
- <managed-bean-class>eclipselink.example.mysports.admin.jsf.DatasourceRepositoryBean</managed-bean-class>
-
- <managed-bean-scope>request</managed-bean-scope></managed-bean>
- <managed-bean>
- <managed-bean-name>hostEnvironmentRepository</managed-bean-name>
- <managed-bean-class>eclipselink.example.mysports.admin.jsf.HostEnvironmentRepositoryBean</managed-bean-class>
-
- <managed-bean-scope>request</managed-bean-scope></managed-bean>
-
- <lifecycle>
- <phase-listener>example.mysports.admin.jsf.MySportsPhaseListener</phase-listener>
- </lifecycle>
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"
+ version="2.1">
</faces-config>
diff --git a/admin.web/src/main/webapp/template.jsf b/admin.web/src/main/webapp/WEB-INF/template.xhtml
similarity index 77%
rename from admin.web/src/main/webapp/template.jsf
rename to admin.web/src/main/webapp/WEB-INF/template.xhtml
index 5f5fbfa..d5605a7 100644
--- a/admin.web/src/main/webapp/template.jsf
+++ b/admin.web/src/main/webapp/WEB-INF/template.xhtml
@@ -8,14 +8,16 @@
<head>
<title><ui:insert name="title" /></title>
-<link rel="stylesheet" type="text/css" href="default.css" />
+<style type="text/css" media="all">
+@import "#{request.contextPath}/default.css";
+</style>
</head>
<body>
<f:view>
<div class="message-box">
<div class="header">
<div align="right">
- <img src="images/mysports.png"></img>
+ <img src="#{request.contextPath}/images/mysports.png"></img>
</div>
<h1>
<ui:insert name="title" />
@@ -30,7 +32,7 @@
<hr />
<div align="center">
<a href="http://www.eclipse.org/eclipselink"><h:graphicImage
- url="/images/eclipselink.png" alt="EclipseLink" /> </a>
+ url="#{request.contextPath}/images/eclipselink.png" alt="EclipseLink" /> </a>
</div>
</div>
</div>
diff --git a/admin.web/src/main/webapp/WEB-INF/web.xml b/admin.web/src/main/webapp/WEB-INF/web.xml
index 0360977..3946298 100644
--- a/admin.web/src/main/webapp/WEB-INF/web.xml
+++ b/admin.web/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
- <param-value>example.mysports.admin.jaxrs</param-value>
+ <param-value>eclipselink.example.mysports.admin.jaxrs</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
diff --git a/admin.web/src/main/webapp/WEB-INF/weblogic.xml b/admin.web/src/main/webapp/WEB-INF/weblogic.xml
new file mode 100644
index 0000000..2ff05f8
--- /dev/null
+++ b/admin.web/src/main/webapp/WEB-INF/weblogic.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wls:weblogic-web-app
+ xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd http://xmlns.oracle.com/weblogic/weblogic-web-app http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd" >
+ <wls:context-root>mysportsadmin</wls:context-root>
+</wls:weblogic-web-app>
\ No newline at end of file
diff --git a/admin.web/src/main/webapp/about.xhtml b/admin.web/src/main/webapp/about.xhtml
index 9dbfee0..751ae93 100644
--- a/admin.web/src/main/webapp/about.xhtml
+++ b/admin.web/src/main/webapp/about.xhtml
@@ -6,7 +6,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
-<ui:composition template="template.jsf">
+<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="title">My Sports Admin: About</ui:define>
<ui:define name="body">
</ui:define>
diff --git a/admin.web/src/main/webapp/index.jsp b/admin.web/src/main/webapp/index.jsp
deleted file mode 100644
index ab292c3..0000000
--- a/admin.web/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JSP Page</title>
- </head>
- <body>
- <h1>Hello World!</h1>
- </body>
-</html>
diff --git a/admin.web/src/main/webapp/index.xhtml b/admin.web/src/main/webapp/index.xhtml
index 6d07a59..e186635 100644
--- a/admin.web/src/main/webapp/index.xhtml
+++ b/admin.web/src/main/webapp/index.xhtml
@@ -6,7 +6,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
-<ui:composition template="template.jsf">
+<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="title">My Sports Admin</ui:define>
<ui:define name="body">
<div align="center">
diff --git a/admin.web/src/main/webapp/league.xhtml b/admin.web/src/main/webapp/league.xhtml
index 5dd2d91..9200b79 100644
--- a/admin.web/src/main/webapp/league.xhtml
+++ b/admin.web/src/main/webapp/league.xhtml
@@ -7,7 +7,7 @@
xmlns:f="http://java.sun.com/jsf/core">
-<ui:composition template="template.jsf">
+<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="title">My Sports Admin: Hosted League</ui:define>
<ui:define name="body">
<h:form>
diff --git a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/extensions/CreateOrmXML.java b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateOrmXML.java
similarity index 90%
rename from admin.web/src/test/java/eclipselink/example/mysports/admin/test/extensions/CreateOrmXML.java
rename to admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateOrmXML.java
index 949c151..42a207d 100644
--- a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/extensions/CreateOrmXML.java
+++ b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateOrmXML.java
@@ -10,7 +10,7 @@
* Contributors:
* dclarke - EclipseLink 2.3 - MySports Demo Bug 344608
******************************************************************************/
-package eclipselink.example.mysports.admin.test.extensions;
+package eclipselink.example.mysports.admin.test;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -21,7 +21,7 @@
import org.junit.Test;
import eclipselink.example.mysports.admin.services.MappingsLoader;
-import eclipselink.example.mysports.admin.test.PersistenceTesting;
+import eclipselink.example.mysports.admin.services.test.AdminPersistenceTesting;
public class CreateOrmXML {
@@ -35,7 +35,7 @@
@Test
public void createFromDB() {
- EntityManagerFactory emf = Persistence.createEntityManagerFactory("MySportsAdmin", PersistenceTesting.get());
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory("MySportsAdmin", AdminPersistenceTesting.get());
EntityManager em = emf.createEntityManager();
try {
diff --git a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/style/CreateStyles.java b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateStyles.java
similarity index 94%
rename from admin.web/src/test/java/eclipselink/example/mysports/admin/test/style/CreateStyles.java
rename to admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateStyles.java
index 3538906..27fbac6 100644
--- a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/style/CreateStyles.java
+++ b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateStyles.java
@@ -10,7 +10,7 @@
* Contributors: dclarke - EclipseLink 2.3 - MySports Demo Bug 344608
*****************************************************************************
*/
-package eclipselink.example.mysports.admin.test.style;
+package eclipselink.example.mysports.admin.test;
import java.io.InputStream;
import java.io.StringWriter;
@@ -27,7 +27,7 @@
import org.junit.Test;
import eclipselink.example.mysports.admin.model.Style;
-import eclipselink.example.mysports.admin.test.PersistenceTesting;
+import eclipselink.example.mysports.admin.services.test.AdminPersistenceTesting;
/**
* Create initial styles.
@@ -69,7 +69,7 @@
@BeforeClass
public static void createEMF() {
- emf = Persistence.createEntityManagerFactory("MySportsAdmin", PersistenceTesting.get());
+ emf = Persistence.createEntityManagerFactory("MySportsAdmin", AdminPersistenceTesting.get());
EntityManager em = emf.createEntityManager();
try {
diff --git a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/extensions/CreateXMLBindingsTests.java b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateXMLBindingsTests.java
similarity index 92%
rename from admin.web/src/test/java/eclipselink/example/mysports/admin/test/extensions/CreateXMLBindingsTests.java
rename to admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateXMLBindingsTests.java
index ff15582..234fde3 100644
--- a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/extensions/CreateXMLBindingsTests.java
+++ b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/CreateXMLBindingsTests.java
@@ -10,7 +10,7 @@
* Contributors:
* dclarke - EclipseLink 2.3 - MySports Demo Bug 344608
******************************************************************************/
-package eclipselink.example.mysports.admin.test.extensions;
+package eclipselink.example.mysports.admin.test;
public class CreateXMLBindingsTests {
// TODO
diff --git a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/league/LeagueJAXBTests.java b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/LeagueJAXBTests.java
similarity index 93%
rename from admin.web/src/test/java/eclipselink/example/mysports/admin/test/league/LeagueJAXBTests.java
rename to admin.web/src/test/java/eclipselink/example/mysports/admin/test/LeagueJAXBTests.java
index 7661c7a..18dbd0f 100644
--- a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/league/LeagueJAXBTests.java
+++ b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/LeagueJAXBTests.java
@@ -10,7 +10,7 @@
* Contributors:
* dclarke - EclipseLink 2.3 - MySports Demo Bug 344608
******************************************************************************/
-package eclipselink.example.mysports.admin.test.league;
+package eclipselink.example.mysports.admin.test;
import java.util.List;
@@ -28,7 +28,7 @@
import eclipselink.example.mysports.admin.jaxrs.MySportsContextResolver;
import eclipselink.example.mysports.admin.model.HostedLeague;
-import eclipselink.example.mysports.admin.test.PersistenceTesting;
+import eclipselink.example.mysports.admin.services.test.AdminPersistenceTesting;
/**
*
@@ -72,7 +72,7 @@
@BeforeClass
public static void createEMF() {
- emf = Persistence.createEntityManagerFactory("MySportsAdmin", PersistenceTesting.get());
+ emf = Persistence.createEntityManagerFactory("MySportsAdmin", AdminPersistenceTesting.get());
}
@AfterClass
diff --git a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/PersistenceTesting.java b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/PersistenceTesting.java
deleted file mode 100644
index 087e168..0000000
--- a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/PersistenceTesting.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010-2013 Oracle. 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 - EclipseLink 2.4 - MySports Demo Bug 344608
- ******************************************************************************/
-package eclipselink.example.mysports.admin.test;
-
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL_INITIAL;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL_MIN;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.CONNECTION_POOL_READ;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.NON_JTA_DATASOURCE;
-import static org.eclipse.persistence.config.PersistenceUnitProperties.TRANSACTION_TYPE;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.persistence.config.PersistenceUnitProperties;
-
-import eclipselink.example.mysports.test.common.ExamplePropertiesLoader;
-
-public class PersistenceTesting {
-
- public static Map<String, Object> add(Map<String, Object> properties, boolean replaceTables) {
- Map<String, Object> props = properties;
-
- if (props == null) {
- props = new HashMap<String, Object>();
- }
- props.put(TRANSACTION_TYPE, "RESOURCE_LOCAL");
- props.put(NON_JTA_DATASOURCE, "");
-
- props.put(CONNECTION_POOL_READ + CONNECTION_POOL_INITIAL, "1");
- props.put(CONNECTION_POOL_READ + CONNECTION_POOL_MIN, "1");
- props.put(CONNECTION_POOL + CONNECTION_POOL_INITIAL, "1");
- props.put(CONNECTION_POOL + CONNECTION_POOL_MIN, "1");
-
- if (replaceTables) {
- props.put(PersistenceUnitProperties.DDL_GENERATION, PersistenceUnitProperties.DROP_AND_CREATE);
- props.put(PersistenceUnitProperties.DDL_GENERATION_MODE, PersistenceUnitProperties.DDL_DATABASE_GENERATION);
- }
-
- ExamplePropertiesLoader.loadProperties(props);
- return props;
- }
-
- public static Map<String, Object> get(boolean replaceTables) {
- return add(null, replaceTables);
- }
-
- public static Map<String, Object> get() {
- return add(null, false);
- }
-}
diff --git a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/league/SchemaGenerator.java b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/SchemaGenerator.java
similarity index 94%
rename from admin.web/src/test/java/eclipselink/example/mysports/admin/test/league/SchemaGenerator.java
rename to admin.web/src/test/java/eclipselink/example/mysports/admin/test/SchemaGenerator.java
index 58933cf..c53334d 100644
--- a/admin.web/src/test/java/eclipselink/example/mysports/admin/test/league/SchemaGenerator.java
+++ b/admin.web/src/test/java/eclipselink/example/mysports/admin/test/SchemaGenerator.java
@@ -1,4 +1,4 @@
-package eclipselink.example.mysports.admin.test.league;
+package eclipselink.example.mysports.admin.test;
import java.io.File;
import java.io.IOException;
diff --git a/application/.classpath b/application/.classpath
index 1f459f9..bd9c0f4 100644
--- a/application/.classpath
+++ b/application/.classpath
@@ -32,7 +32,6 @@
<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"/>
diff --git a/application/.project b/application/.project
index 0e6db89..4f774b4 100644
--- a/application/.project
+++ b/application/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>application</name>
+ <name>MySports Application</name>
<comment></comment>
<projects>
</projects>
diff --git a/application/.settings/org.eclipse.m2e.core.prefs b/application/.settings/org.eclipse.m2e.core.prefs
index f897a7f..2af59a6 100644
--- a/application/.settings/org.eclipse.m2e.core.prefs
+++ b/application/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
-activeProfiles=
+activeProfiles=mysql
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
diff --git a/application/.settings/org.eclipse.wst.common.component b/application/.settings/org.eclipse.wst.common.component
index 21f5cb5..ef05833 100644
--- a/application/.settings/org.eclipse.wst.common.component
+++ b/application/.settings/org.eclipse.wst.common.component
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="application">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="MySports Application">
<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"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
- <property name="context-root" value="application"/>
- <property name="java-output-path" value="/application/target/classes"/>
+ <property name="java-output-path" value="/MySports Application/target/classes"/>
+ <property name="context-root" value="mysports"/>
</wb-module>
</project-modules>
diff --git a/application/eclipse-config/TestCreateTenantEMF.launch b/application/eclipse-config/TestCreateTenantEMF.launch
index 2031555..1bf4cf0 100644
--- a/application/eclipse-config/TestCreateTenantEMF.launch
+++ b/application/eclipse-config/TestCreateTenantEMF.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.application.test.TestCreateTenantEMF"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="application"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch "b/application/eclipse-config/TestExampleLeagues \0501\051.launch"
similarity index 73%
copy from admin.services/eclipse-runconfigs/TestCreateDatabase.launch
copy to "application/eclipse-config/TestExampleLeagues \0501\051.launch"
index a43b3ea..40e46d5 100644
--- a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch
+++ "b/application/eclipse-config/TestExampleLeagues \0501\051.launch"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java"/>
+<listEntry value="/MySports Application/src/test/java/eclipselink/example/mysports/application/test/TestExampleLeagues.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -11,8 +11,8 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateDatabase"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.application.test.TestExampleLeagues"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MySports Application"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/application/eclipse-config/TestExampleLeagues.launch b/application/eclipse-config/TestExampleLeagues.launch
index 27b26f1..48ee848 100644
--- a/application/eclipse-config/TestExampleLeagues.launch
+++ b/application/eclipse-config/TestExampleLeagues.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.application.test.TestExampleLeagues"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="application"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/application/eclipse-config/TestModelAndMappings.launch b/application/eclipse-config/TestModelAndMappings.launch
index cd87fa4..e3f8b0f 100644
--- a/application/eclipse-config/TestModelAndMappings.launch
+++ b/application/eclipse-config/TestModelAndMappings.launch
@@ -10,9 +10,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.application.test.TestModelAndMappings"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="application"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch "b/application/eclipse-config/TestSchemaCreation \0501\051.launch"
similarity index 73%
copy from admin.services/eclipse-runconfigs/TestCreateDatabase.launch
copy to "application/eclipse-config/TestSchemaCreation \0501\051.launch"
index a43b3ea..768fa0c 100644
--- a/admin.services/eclipse-runconfigs/TestCreateDatabase.launch
+++ "b/application/eclipse-config/TestSchemaCreation \0501\051.launch"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/admin.services/src/test/java/eclipselink/example/mysports/admin/services/test/TestCreateDatabase.java"/>
+<listEntry value="/MySports Application/src/test/java/eclipselink/example/mysports/application/test/TestSchemaCreation.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -11,8 +11,8 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.admin.services.test.TestCreateDatabase"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="admin.services"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.mysports.application.test.TestSchemaCreation"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MySports Application"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/eclipselink/example/mysports/persistence/2.4.2-SNAPSHOT/persistence-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/application/pom.xml b/application/pom.xml
index 58637da..79f86cf 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -132,4 +132,53 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>mysql</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.22</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.4</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>javax.persistence.jdbc.url</name>
+ <value>jdbc:mysql://localhost:3306/mysports</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.driver</name>
+ <value>com.mysql.jdbc.Driver</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.user</name>
+ <value>mysports</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.password</name>
+ <value>mysports</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/application/src/main/java/eclipselink/example/mysports/application/admin/MoxyContextHelper.java b/application/src/main/java/eclipselink/example/mysports/application/admin/MoxyContextHelper.java
index de65ee9..c3aedb3 100644
--- a/application/src/main/java/eclipselink/example/mysports/application/admin/MoxyContextHelper.java
+++ b/application/src/main/java/eclipselink/example/mysports/application/admin/MoxyContextHelper.java
@@ -44,7 +44,7 @@
public static JAXBContext getContext() throws JAXBException {
if (jaxbContext == null) {
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextProperties.OXM_METADATA_SOURCE, "example/mysports/admin/leagues-oxm.xml");
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, "eclipselink/example/mysports/application/admin/leagues-oxm.xml");
jaxbContext = JAXBContextFactory.createContext(new Class[] { HostedLeagues.class }, props);
}
return jaxbContext;
diff --git a/application/src/main/java/eclipselink/example/mysports/application/admin/RESTAdminServerConnector.java b/application/src/main/java/eclipselink/example/mysports/application/admin/RESTAdminServerConnector.java
index 811e14d..53eef18 100644
--- a/application/src/main/java/eclipselink/example/mysports/application/admin/RESTAdminServerConnector.java
+++ b/application/src/main/java/eclipselink/example/mysports/application/admin/RESTAdminServerConnector.java
@@ -32,7 +32,7 @@
/**
* Default Root URI for the Admin application. Assumed to be hosted on the same container.
*/
- public static final String DEFAULT_ROOT_URI = "http://localhost:8080/MySportsAdmin/rest/league";
+ public static final String DEFAULT_ROOT_URI = "http://localhost:7001/mysportsadmin/rest/league";
private String rootURI = DEFAULT_ROOT_URI;
diff --git a/application/src/main/java/eclipselink/example/mysports/application/admin/leagues-oxm.xml b/application/src/main/java/eclipselink/example/mysports/application/admin/leagues-oxm.xml
index 0cc6816..41b6546 100644
--- a/application/src/main/java/eclipselink/example/mysports/application/admin/leagues-oxm.xml
+++ b/application/src/main/java/eclipselink/example/mysports/application/admin/leagues-oxm.xml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<xml-bindings version="2.3"
xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm"
- package-name="example.mysports.admin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ package-name="eclipselink.example.mysports.application.admin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.eclipse.org/eclipselink/xsds/persistence/oxm http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_3.xsd">
<java-types>
<java-type name="HostedLeagues" xml-accessor-type="FIELD">
- <xml-root-element name="hosted-leagues"/>
+ <xml-root-element name="hostedLeagues"/>
<java-attributes>
<xml-element java-attribute="leagues" name="league" />
</java-attributes>
diff --git a/application/src/main/resources/META-INF/persistence.xml b/application/src/main/resources/META-INF/persistence.xml
index 4134dc6..b2efd78 100644
--- a/application/src/main/resources/META-INF/persistence.xml
+++ b/application/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
<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="mysports" transaction-type="RESOURCE_LOCAL">
<provider>eclipselink.example.mysports.persistence.TenantPerEMFProvider</provider>
- <non-jta-data-source>jdbc/MySports</non-jta-data-source>
+ <non-jta-data-source>java:global/mysports</non-jta-data-source>
<mapping-file>META-INF/local-eclipselink-orm.xml</mapping-file>
<class>eclipselink.example.mysports.application.model.Division</class>
@@ -20,8 +20,9 @@
<property name="eclipselink.logging.connection" value="false"/>
<property name="eclipselink.logging.level.metadata" value="WARNING"/>
<property name="eclipselink.logging.parameters" value="true"/>
- <property name="eclipselink.logging.session" value="true"/>
- <property name="eclipselink.logging.exceptions" value="true"/>
+ <property name="eclipselink.logging.session" value="false"/>
+ <property name="eclipselink.logging.exceptions" value="false"/>
+ <property name="eclipselink.logging.level.metadata" value="WARNING"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/application/src/main/webapp/WEB-INF/web.xml b/application/src/main/webapp/WEB-INF/web.xml
index 7d90b2d..5c2c718 100644
--- a/application/src/main/webapp/WEB-INF/web.xml
+++ b/application/src/main/webapp/WEB-INF/web.xml
@@ -1,20 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <display-name>MySports</display-name>
- <welcome-file-list>
- <welcome-file>faces/index.xhtml</welcome-file>
- </welcome-file-list>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
-
+<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">
+ <display-name>MySports</display-name>
+ <welcome-file-list>
+ <welcome-file>faces/index.xhtml</welcome-file>
+ </welcome-file-list>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
</web-app>
\ No newline at end of file
diff --git a/application/src/main/webapp/WEB-INF/weblogic.xml b/application/src/main/webapp/WEB-INF/weblogic.xml
new file mode 100644
index 0000000..35b58f6
--- /dev/null
+++ b/application/src/main/webapp/WEB-INF/weblogic.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wls:weblogic-web-app
+ xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd http://xmlns.oracle.com/weblogic/weblogic-web-app http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd" >
+ <wls:context-root>mysports</wls:context-root>
+</wls:weblogic-web-app>
\ No newline at end of file
diff --git a/persistence/.classpath b/persistence/.classpath
index 18801b6..efc51b4 100644
--- a/persistence/.classpath
+++ b/persistence/.classpath
@@ -22,7 +22,7 @@
<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/JavaSE-1.6">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/persistence/.project b/persistence/.project
index 885ce09..8f08cc0 100644
--- a/persistence/.project
+++ b/persistence/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>persistence</name>
+ <name>MySports Persistence</name>
<comment></comment>
<projects>
</projects>
diff --git a/persistence/.settings/org.eclipse.jdt.core.prefs b/persistence/.settings/org.eclipse.jdt.core.prefs
index 60105c1..443e085 100644
--- a/persistence/.settings/org.eclipse.jdt.core.prefs
+++ b/persistence/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/persistence/pom.xml b/persistence/pom.xml
index 0dffbab..d3c408f 100644
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -43,21 +43,9 @@
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/persistence/src/test/java/eclipselink/example/mysports/test/common/ExamplePropertiesLoader.java b/persistence/src/test/java/eclipselink/example/mysports/test/common/ExamplePropertiesLoader.java
index c3c5b4f..28832af 100644
--- a/persistence/src/test/java/eclipselink/example/mysports/test/common/ExamplePropertiesLoader.java
+++ b/persistence/src/test/java/eclipselink/example/mysports/test/common/ExamplePropertiesLoader.java
@@ -24,7 +24,7 @@
* Helper class that will load persistence unit overrides from a properties file
* in both the current running folder and the current user's home folder. The
* goal is to enable developers and users of the example to customize its
- * behaviour without having to modify the source of the example.
+ * behavior without having to modify the source of the example.
*
* @author dclarke
* @since EclipseLink 2.0.0
diff --git a/pom.xml b/pom.xml
index 0c9fc50..efcee24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,5 +78,57 @@
</plugin>
</plugins>
</build>
+
+ <!-- Profile to run tests and populate sample data in a MySQL DB
+ data source will be using. USAGE: mvn -P mysql -->
+ <profiles>
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>mysql</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.22</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.4</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>javax.persistence.jdbc.url</name>
+ <value>jdbc:mysql://localhost:3306/mysports</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.driver</name>
+ <value>com.mysql.jdbc.Driver</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.user</name>
+ <value>mysports</value>
+ </property>
+ <property>
+ <name>javax.persistence.jdbc.password</name>
+ <value>mysports</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
