Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Clarke2013-03-20 20:36:25 -0400
committerDoug Clarke2013-03-20 20:36:25 -0400
commit4721e9dc63ab4a212b7be00b5461e0db467759d1 (patch)
tree26580bd5a38f68bd361b88e8aa6fb8a2271b5de7
parente3f7bb1788bf505f2e05058a3cc8653769c329f6 (diff)
downloadmysports-4721e9dc63ab4a212b7be00b5461e0db467759d1.tar.gz
mysports-4721e9dc63ab4a212b7be00b5461e0db467759d1.tar.xz
mysports-4721e9dc63ab4a212b7be00b5461e0db467759d1.zip
Eclipse project cleanup
-rw-r--r--admin.services/.classpath2
-rw-r--r--admin.services/.project4
-rw-r--r--admin.services/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--admin.web/.classpath5
-rw-r--r--admin.web/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--admin.web/.settings/org.eclipse.wst.common.component9
-rw-r--r--admin.web/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml5
-rw-r--r--admin.web/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--admin.web/src/main/webapp/WEB-INF/weblogic.xml7
-rw-r--r--application/.classpath3
-rw-r--r--application/.settings/org.eclipse.wst.common.component9
-rw-r--r--application/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml10
-rw-r--r--application/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--application/src/main/java/resources/application.properties7
-rw-r--r--application/src/main/webapp/WEB-INF/faces-config.xml6
-rw-r--r--application/src/main/webapp/WEB-INF/weblogic.xml7
-rw-r--r--persistence/.classpath1
-rw-r--r--persistence/.project13
-rw-r--r--persistence/.settings/org.eclipse.wst.common.component7
-rw-r--r--persistence/.settings/org.eclipse.wst.common.project.facet.core.xml5
-rw-r--r--pom.xml10
21 files changed, 92 insertions, 30 deletions
diff --git a/admin.services/.classpath b/admin.services/.classpath
index c32fd9e..9a07d21 100644
--- a/admin.services/.classpath
+++ b/admin.services/.classpath
@@ -18,6 +18,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
+ <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/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
@@ -28,6 +29,5 @@
<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 892bf6c..1ae4406 100644
--- a/admin.services/.project
+++ b/admin.services/.project
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/admin.services/.settings/org.eclipse.jdt.core.prefs b/admin.services/.settings/org.eclipse.jdt.core.prefs
index 443e085..4ede96d 100644
--- a/admin.services/.settings/org.eclipse.jdt.core.prefs
+++ b/admin.services/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,2 @@
eclipse.preferences.version=1
-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.7
diff --git a/admin.web/.classpath b/admin.web/.classpath
index 96047cb..c0f4868 100644
--- a/admin.web/.classpath
+++ b/admin.web/.classpath
@@ -17,9 +17,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <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">
+ <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,6 +25,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
diff --git a/admin.web/.settings/org.eclipse.jdt.core.prefs b/admin.web/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/admin.web/.settings/org.eclipse.jdt.core.prefs
+++ b/admin.web/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/admin.web/.settings/org.eclipse.wst.common.component b/admin.web/.settings/org.eclipse.wst.common.component
index 897efab..5fd3056 100644
--- a/admin.web/.settings/org.eclipse.wst.common.component
+++ b/admin.web/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,13 @@
<?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"/>
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+ <dependent-module archiveName="admin.services-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MySports Admin Services/MySports Admin Services">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="java-output-path" value="/MySports Admin Web/target/classes"/>
- <property name="context-root" value="mysportsadmin"/>
+ <property name="context-root" value="admin.web"/>
</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
index c32233e..6d59853 100644
--- 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
@@ -4,4 +4,9 @@
<attribute name="provider-id" value="jsf-no-op-library-provider"/>
</node>
</facet>
+ <facet id="jst.jaxrs">
+ <node name="libprov">
+ <attribute name="provider-id" value="jaxrs-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
index 4f73bdc..469c5a0 100644
--- a/admin.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/admin.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,4 +5,5 @@
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jsf" version="2.1"/>
<installed facet="wst.jsdt.web" version="1.0"/>
+ <installed facet="jst.jaxrs" version="1.1"/>
</faceted-project>
diff --git a/admin.web/src/main/webapp/WEB-INF/weblogic.xml b/admin.web/src/main/webapp/WEB-INF/weblogic.xml
index 2ff05f8..799e995 100644
--- a/admin.web/src/main/webapp/WEB-INF/weblogic.xml
+++ b/admin.web/src/main/webapp/WEB-INF/weblogic.xml
@@ -1,7 +1,4 @@
<?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 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>admin.web</wls:context-root>
</wls:weblogic-web-app> \ No newline at end of file
diff --git a/application/.classpath b/application/.classpath
index bd9c0f4..c99cf86 100644
--- a/application/.classpath
+++ b/application/.classpath
@@ -22,8 +22,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <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/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
@@ -32,6 +30,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
diff --git a/application/.settings/org.eclipse.wst.common.component b/application/.settings/org.eclipse.wst.common.component
index ef05833..0a2eaba 100644
--- a/application/.settings/org.eclipse.wst.common.component
+++ b/application/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,14 @@
<?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="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+ <dependent-module archiveName="persistence-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MySports Persistence/MySports Persistence">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="java-output-path" value="/MySports Application/target/classes"/>
- <property name="context-root" value="mysports"/>
+ <property name="context-root" value="application"/>
</wb-module>
</project-modules>
diff --git a/application/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/application/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
index 7961132..d564e65 100644
--- a/application/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ b/application/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -4,4 +4,14 @@
<attribute name="provider-id" value="jpa-no-op-library-provider"/>
</node>
</facet>
+ <facet id="jst.jaxrs">
+ <node name="libprov">
+ <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
+ </node>
+ </facet>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+ </node>
+ </facet>
</root>
diff --git a/application/.settings/org.eclipse.wst.common.project.facet.core.xml b/application/.settings/org.eclipse.wst.common.project.facet.core.xml
index ef7e88f..6fa65b6 100644
--- a/application/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/application/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,4 +5,6 @@
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.6"/>
<installed facet="jpt.jpa" version="2.0"/>
+ <installed facet="jst.jaxrs" version="1.1"/>
+ <installed facet="jst.jsf" version="2.0"/>
</faceted-project>
diff --git a/application/src/main/java/resources/application.properties b/application/src/main/java/resources/application.properties
new file mode 100644
index 0000000..5b9198d
--- /dev/null
+++ b/application/src/main/java/resources/application.properties
@@ -0,0 +1,7 @@
+# -- welcome --
+welcomeTitle=JSF Blank Application
+
+welcomeHeading=Welcome!
+
+welcomeMessage=This is a JSF blank application. \
+ You can find the application.properties file with this message in the src/resources folder.
diff --git a/application/src/main/webapp/WEB-INF/faces-config.xml b/application/src/main/webapp/WEB-INF/faces-config.xml
index 2c9345f..6b9c92a 100644
--- a/application/src/main/webapp/WEB-INF/faces-config.xml
+++ b/application/src/main/webapp/WEB-INF/faces-config.xml
@@ -3,6 +3,12 @@
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">
+ <application>
+ <message-bundle>resources.application</message-bundle>
+ <locale-config>
+ <default-locale>en</default-locale>
+ </locale-config>
+ </application>
<lifecycle>
<phase-listener>eclipselink.example.mysports.application.view.MySportsPhaseListener</phase-listener>
diff --git a/application/src/main/webapp/WEB-INF/weblogic.xml b/application/src/main/webapp/WEB-INF/weblogic.xml
index 35b58f6..a31a19c 100644
--- a/application/src/main/webapp/WEB-INF/weblogic.xml
+++ b/application/src/main/webapp/WEB-INF/weblogic.xml
@@ -1,7 +1,4 @@
<?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 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>application</wls:context-root>
</wls:weblogic-web-app> \ No newline at end of file
diff --git a/persistence/.classpath b/persistence/.classpath
index efc51b4..37f9528 100644
--- a/persistence/.classpath
+++ b/persistence/.classpath
@@ -30,6 +30,7 @@
<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/persistence/.project b/persistence/.project
index 8f08cc0..078e5a9 100644
--- a/persistence/.project
+++ b/persistence/.project
@@ -6,18 +6,31 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.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>
</natures>
</projectDescription>
diff --git a/persistence/.settings/org.eclipse.wst.common.component b/persistence/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..de82c86
--- /dev/null
+++ b/persistence/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="MySports Persistence">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ </wb-module>
+</project-modules>
diff --git a/persistence/.settings/org.eclipse.wst.common.project.facet.core.xml b/persistence/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..4f92af5
--- /dev/null
+++ b/persistence/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.7"/>
+</faceted-project>
diff --git a/pom.xml b/pom.xml
index efcee24..4055749 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,16 @@
<skip>true</skip>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
</plugins>
</build>

Back to the top