Addressed project warnings
diff --git a/eclipselink.examples.mysports.admin/.classpath b/eclipselink.examples.mysports.admin/.classpath
index f6cacb7..b59c168 100644
--- a/eclipselink.examples.mysports.admin/.classpath
+++ b/eclipselink.examples.mysports.admin/.classpath
@@ -27,6 +27,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/eclipselink.examples.mysports.admin/src/main/java/example/mysports/admin/jaxrs/MappingsLoader.java b/eclipselink.examples.mysports.admin/src/main/java/example/mysports/admin/jaxrs/MappingsLoader.java
index 536d469..c6a4e34 100644
--- a/eclipselink.examples.mysports.admin/src/main/java/example/mysports/admin/jaxrs/MappingsLoader.java
+++ b/eclipselink.examples.mysports.admin/src/main/java/example/mysports/admin/jaxrs/MappingsLoader.java
@@ -116,6 +116,9 @@
multitenant.setTenantTableDiscriminator(tenantTableDiscriminator);
accessor.setMultitenant(multitenant);
break;
+
+ case DATABASE:
+ throw new RuntimeException("DataIsolation.DATABASE::NOT YET SUPPORTED");
}
if (league != null) {
diff --git a/eclipselink.examples.mysports.application/.classpath b/eclipselink.examples.mysports.application/.classpath
index aab8fe1..6ba9149 100644
--- a/eclipselink.examples.mysports.application/.classpath
+++ b/eclipselink.examples.mysports.application/.classpath
@@ -29,6 +29,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/eclipselink.examples.mysports.application/WebContent/template.jsf b/eclipselink.examples.mysports.application/WebContent/template.jsf
index 9685531..9d4c9d0 100644
--- a/eclipselink.examples.mysports.application/WebContent/template.jsf
+++ b/eclipselink.examples.mysports.application/WebContent/template.jsf
@@ -23,7 +23,7 @@
<td width="100%" valign="middle"><h1><h:outputLabel
value="#{viewLeague.leagueName}" /></h1></td>
<td width="100" valign="top" align="right"><h:commandButton
- value="MySports" action="index" image="images/mysports.png"
+ value="MySports" action="#{viewLeague.home}" image="images/mysports.png"
rendered="#{lookAndFeel.multitenant}" /></td>
<td width="50" align="center"></td>
diff --git a/eclipselink.examples.mysports.application/WebContent/tsa/index.html b/eclipselink.examples.mysports.application/WebContent/tsa/index.html
index e48aa67..f524909 100644
--- a/eclipselink.examples.mysports.application/WebContent/tsa/index.html
+++ b/eclipselink.examples.mysports.application/WebContent/tsa/index.html
@@ -7,16 +7,19 @@
<head>
<title>My Sports</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="/dojo/1.7.2/dijit/themes/claro/claro.css" rel="stylesheet" />
<link href="mysports.css" rel="stylesheet" />
+
+<!-- DOJO deployed locally on the server -->
+<link href="/dojo/1.7.2/dijit/themes/claro/claro.css" rel="stylesheet" />
+<script src="/dojo/1.7.2/dojo/dojo.js"></script>
+
+<script src="mysports.js"></script>
<script>
djConfig = {
isDebug : false,
parseOnLoad : true
}
</script>
-<script src="/dojo/1.7.2/dojo/dojo.js"></script>
-<script src="mysports.js"></script>
<script>
dojo.addOnLoad(function() {
console.debug("Dojo Loaded: ", dojo.version);
@@ -52,10 +55,5 @@
<div id="playersTableDiv"></div>
</div>
</div>
- <div align="center">
- <a href="index.html?league=HTHL">HTHL</a> -
- <a href="index.html?league=OSL">OSL</a> -
- <a href="index.html?league=KFL">KFL</a>
- </div>
</body>
</html>
diff --git a/eclipselink.examples.mysports.application/diagrams/eclipselink.examples.mysports.application.xml b/eclipselink.examples.mysports.application/diagrams/eclipselink.examples.mysports.application.xml
deleted file mode 100644
index 435f073..0000000
--- a/eclipselink.examples.mysports.application/diagrams/eclipselink.examples.mysports.application.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><entities>
- <entity>
- <entity-name>example.mysports.model.User</entity-name>
- <entity-width>120</entity-width>
- <entity-height>148</entity-height>
- <entity-X-Coordinate>20</entity-X-Coordinate>
- <entity-Y-Coordinate>348</entity-Y-Coordinate>
- <primary-collapsed>false</primary-collapsed>
- <relation-collapsed>false</relation-collapsed>
- <basic-collapsed>false</basic-collapsed>
- </entity>
-
- <entity>
- <entity-name>example.mysports.model.Team</entity-name>
- <entity-width>120</entity-width>
- <entity-height>206</entity-height>
- <entity-X-Coordinate>210</entity-X-Coordinate>
- <entity-Y-Coordinate>20</entity-Y-Coordinate>
- <primary-collapsed>false</primary-collapsed>
- <relation-collapsed>false</relation-collapsed>
- <basic-collapsed>false</basic-collapsed>
- </entity>
-
- <entity>
- <entity-name>example.mysports.model.Player</entity-name>
- <entity-width>120</entity-width>
- <entity-height>266</entity-height>
- <entity-X-Coordinate>20</entity-X-Coordinate>
- <entity-Y-Coordinate>21</entity-Y-Coordinate>
- <primary-collapsed>false</primary-collapsed>
- <relation-collapsed>false</relation-collapsed>
- <basic-collapsed>false</basic-collapsed>
- </entity>
-
- <entity>
- <entity-name>example.mysports.model.Division</entity-name>
- <entity-width>120</entity-width>
- <entity-height>206</entity-height>
- <entity-X-Coordinate>210</entity-X-Coordinate>
- <entity-Y-Coordinate>290</entity-Y-Coordinate>
- <primary-collapsed>false</primary-collapsed>
- <relation-collapsed>false</relation-collapsed>
- <basic-collapsed>false</basic-collapsed>
- </entity>
-</entities>
\ No newline at end of file
diff --git a/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/BaseManagedBean.java b/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/BaseManagedBean.java
index ba3d649..d09bc27 100644
--- a/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/BaseManagedBean.java
+++ b/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/BaseManagedBean.java
@@ -51,4 +51,9 @@
public boolean isMultitenant() {
return getMySportsConfig().isMultitenant();
}
+
+ public String home() {
+ return LeaguesList.PAGE;
+ }
+
}
diff --git a/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/LeaguesList.java b/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/LeaguesList.java
index 64d3550..5ae64e1 100644
--- a/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/LeaguesList.java
+++ b/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/LeaguesList.java
@@ -25,6 +25,8 @@
@ManagedBean
public class LeaguesList extends BaseManagedBean {
+ protected static final String PAGE = "index";
+
private Leagues leagues;
public Leagues getLeagues() {
diff --git a/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/ViewLeague.java b/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/ViewLeague.java
index 958cc8f..9353873 100644
--- a/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/ViewLeague.java
+++ b/eclipselink.examples.mysports.application/src/main/java/example/mysports/web/jsf/ViewLeague.java
@@ -55,4 +55,5 @@
public String view() {
return PAGE;
}
+
}
