Upgraded to final EclipseLink 2.4 version of JPA-RS
diff --git a/MySports Admin/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120530-r11547.jar b/MySports Admin/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120530-r11547.jar
deleted file mode 100644
index 7d27d44..0000000
--- a/MySports Admin/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120530-r11547.jar
+++ /dev/null
Binary files differ
diff --git a/MySports Admin/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120608-r11652.jar b/MySports Admin/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120608-r11652.jar
new file mode 100644
index 0000000..da3f6ee
--- /dev/null
+++ b/MySports Admin/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120608-r11652.jar
Binary files differ
diff --git a/MySports Admin/WebContent/index.xhtml b/MySports Admin/WebContent/index.xhtml
index 191cbda..6d07a59 100644
--- a/MySports Admin/WebContent/index.xhtml
+++ b/MySports Admin/WebContent/index.xhtml
@@ -33,10 +33,6 @@
<h:outputText value="#{league.name}" />
</h:column>
<h:column>
- <f:facet name="header">Application</f:facet>
- <h:outputText value="#{league.shared}" />
- </h:column>
- <h:column>
<f:facet name="header">Data Isolation</f:facet>
<h:outputText value="#{league.dataIsolation}" />
</h:column>
diff --git a/MySports Admin/WebContent/template.jsf b/MySports Admin/WebContent/template.jsf
index 15ed7a9..5f5fbfa 100644
--- a/MySports Admin/WebContent/template.jsf
+++ b/MySports Admin/WebContent/template.jsf
@@ -13,18 +13,18 @@
<body>
<f:view>
<div class="message-box">
- <div class="header">
- <div align="right">
- <img src="images/mysports.png"></img>
- </div>
- <h1>
- <ui:insert name="title" />
- </h1>
+ <div class="header">
+ <div align="right">
+ <img src="images/mysports.png"></img>
</div>
+ <h1>
+ <ui:insert name="title" />
+ </h1>
+ </div>
<div class="body">
<table width="100%">
- <tr height="400">
- <td><ui:insert name="body" /></td>
+ <tr>
+ <td height="400"><ui:insert name="body" /></td>
</tr>
</table>
<hr />
diff --git a/MySports Admin/src/example/mysports/admin/jaxrs/MySportsContextResolver.java b/MySports Admin/src/example/mysports/admin/jaxrs/MySportsContextResolver.java
index 8ba2791..889d875 100644
--- a/MySports Admin/src/example/mysports/admin/jaxrs/MySportsContextResolver.java
+++ b/MySports Admin/src/example/mysports/admin/jaxrs/MySportsContextResolver.java
@@ -23,6 +23,7 @@
import javax.xml.bind.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import example.mysports.admin.model.HostedLeague;
@@ -58,7 +59,7 @@
public static JAXBContext createContext() throws JAXBException {
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, MAPPING_FILE);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, MAPPING_FILE);
return JAXBContextFactory.createContext(new Class[] { HostedLeague.class }, props);
}
diff --git a/MySports App/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120608-r11652.jar b/MySports App/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120608-r11652.jar
new file mode 100644
index 0000000..da3f6ee
--- /dev/null
+++ b/MySports App/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.4.0.v20120608-r11652.jar
Binary files differ
diff --git a/MySports App/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.5.0.qualifier.jar b/MySports App/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.5.0.qualifier.jar
deleted file mode 100644
index 2872b77..0000000
--- a/MySports App/WebContent/WEB-INF/lib/org.eclipse.persistence.jpars_2.5.0.qualifier.jar
+++ /dev/null
Binary files differ
diff --git a/MySports App/WebContent/template.jsf b/MySports App/WebContent/template.jsf
index 19dd9f5..9685531 100644
--- a/MySports App/WebContent/template.jsf
+++ b/MySports App/WebContent/template.jsf
@@ -49,7 +49,7 @@
</h:form>
<ui:insert name="body" />
- <p height="100"> </p>
+ <p> </p>
<table width="100%" class="accent">
<tr>
<td height="10"></td>
diff --git a/MySports App/WebContent/tsa/lib/demo/demo.js b/MySports App/WebContent/tsa/lib/demo/demo.js
index 9a951ce..09e400d 100644
--- a/MySports App/WebContent/tsa/lib/demo/demo.js
+++ b/MySports App/WebContent/tsa/lib/demo/demo.js
@@ -85,7 +85,8 @@
demoApp.utils.get({
url: teamInfo.href,
onSuccess: function(teamData) {
- console.debug("Team Data for divsion : ", division.id, teamData)
+ console.debug("Team Data for divsion : ", division.id, teamData);
+
dojo.forEach(teamData, function(team) {
team.type = "team";
dojo.forEach(team.relationships, function(teamRel) {
@@ -97,12 +98,12 @@
});
if(index == (teamLength -1)) {
if(doneLoadingTeams) {
- doneLoadingTeams.call(this)
+ doneLoadingTeams.call(this);
}
}
},
context: this
- })
+ });
}, this);
},
@@ -209,7 +210,7 @@
dojo.create("th", {
"class": (index == 0?"first":(index==this.attributes.length-1?"last":"")),
innerHTML: colInfo.name
- }, headerRow)
+ }, headerRow);
}, this);
},
@@ -231,9 +232,9 @@
destroyAllRows: function() {
dojo.forEach(this.rows, function(row) {
dojo.destroy(row);
- })
+ });
}
-})
+});
diff --git a/MySports App/src/META-INF/services/javax.persistence.spi.PersistenceProvider b/MySports App/jpa-provider/META-INF/services/javax.persistence.spi.PersistenceProvider
similarity index 100%
rename from MySports App/src/META-INF/services/javax.persistence.spi.PersistenceProvider
rename to MySports App/jpa-provider/META-INF/services/javax.persistence.spi.PersistenceProvider
diff --git a/MySports App/src/example/mysports/admin/MoxyContextHelper.java b/MySports App/src/example/mysports/admin/MoxyContextHelper.java
index b602405..1916cc5 100644
--- a/MySports App/src/example/mysports/admin/MoxyContextHelper.java
+++ b/MySports App/src/example/mysports/admin/MoxyContextHelper.java
@@ -24,6 +24,7 @@
import javax.xml.bind.Unmarshaller;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.oxm.MediaType;
/**
@@ -43,7 +44,7 @@
public static JAXBContext getContext() throws JAXBException {
if (jaxbContext == null) {
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, "example/mysports/admin/leagues-oxm.xml");
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, "example/mysports/admin/leagues-oxm.xml");
jaxbContext = JAXBContextFactory.createContext(new Class[] { Leagues.class }, props);
}
return jaxbContext;
diff --git a/MySports Tests/.classpath b/MySports Tests/.classpath
index 1c552ec..4b268eb 100644
--- a/MySports Tests/.classpath
+++ b/MySports Tests/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Oracle WebLogic Server 11gR1 (10.3.4) JRE"/>
- <classpathentry combineaccessrules="false" kind="src" path="/javax.persistence 2.0.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src"/>
<classpathentry kind="src" path="agent-src"/>
<classpathentry kind="src" path="javafx-client"/>
diff --git a/MySports Tests/eclipselink-example-mysports.properties b/MySports Tests/eclipselink-example-mysports.properties
index fdbe7fd..e1db1cd 100644
--- a/MySports Tests/eclipselink-example-mysports.properties
+++ b/MySports Tests/eclipselink-example-mysports.properties
@@ -1,6 +1,5 @@
javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/mysports
-# javax.persistence.jdbc.url=jdbc:mysql://slc01nuv:3306/my_sports
javax.persistence.jdbc.user=root
javax.persistence.jdbc.password=password
diff --git a/MySports Tests/src/example/mysports/tests/jpars/StartJersey.java b/MySports Tests/src/example/mysports/tests/jpars/StartJersey.java
deleted file mode 100644
index 9853b44..0000000
--- a/MySports Tests/src/example/mysports/tests/jpars/StartJersey.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package example.mysports.tests.jpars;
-
-import java.io.IOException;
-import java.net.URI;
-
-import javax.ws.rs.core.UriBuilder;
-
-import org.eclipse.persistence.jpa.rs.JparsResourceConfig;
-
-import com.sun.jersey.api.container.httpserver.HttpServerFactory;
-import com.sun.jersey.api.core.ResourceConfig;
-import com.sun.net.httpserver.HttpServer;
-
-public class StartJersey {
-
- public static void main(String[] args) throws IOException, InterruptedException {
- HttpServer server = startServer();
- Thread.sleep(100000000);
- server.stop(1);
- }
-
- protected static HttpServer startServer() throws IOException {
- URI uri = UriBuilder.fromUri("http://localhost/").port(9998).build();
- ResourceConfig rc = new JparsResourceConfig();
- return HttpServerFactory.create(uri, rc);
- }
-
-}
