Menu
▾
▴
[Magicmap-commits] SF.net SVN: magicmap: [483] branches/newjpox/magicmapserver
|
From: <fle...@us...> - 2006-11-12 12:40:45
|
Revision: 483
http://svn.sourceforge.net/magicmap/?rev=483&view=rev
Author: flederohr
Date: 2006-11-12 04:36:33 -0800 (Sun, 12 Nov 2006)
Log Message:
-----------
new jpox in server (unfinished)
Modified Paths:
--------------
branches/newjpox/magicmapserver/.classpath
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/AccessPoint.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Client.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GeoPosition.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GridField.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Hardware.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Location.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Map.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Position.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/ScanResult.java
branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Session.java
branches/newjpox/magicmapserver/src/net/sf/magicmap/server/Init.java
branches/newjpox/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java
Added Paths:
-----------
branches/newjpox/magicmapserver/dblayer/lib/jdo2-api-2.0.jar
branches/newjpox/magicmapserver/dblayer/lib/jpox-1.1.3.jar
branches/newjpox/magicmapserver/dblayer/lib/jpox-enhancer-1.1.3.jar
branches/newjpox/magicmapserver/web/WEB-INF/lib/jdo2-api-2.0.jar
branches/newjpox/magicmapserver/web/WEB-INF/lib/jpox-1.1.3.jar
Removed Paths:
-------------
branches/newjpox/magicmapserver/dblayer/lib/jpox-1.1.0-beta-1.jar
branches/newjpox/magicmapserver/dblayer/lib/jpox-enhancer-1.1.0-beta-1.jar
branches/newjpox/magicmapserver/web/WEB-INF/lib/jpox-20041204.032009.jar
Modified: branches/newjpox/magicmapserver/.classpath
===================================================================
--- branches/newjpox/magicmapserver/.classpath 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/.classpath 2006-11-12 12:36:33 UTC (rev 483)
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry output="dblayer/bin" kind="src" path="dblayer/src"/>
+ <classpathentry kind="src" output="dblayer/bin" path="dblayer/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="web/WEB-INF/lib/log4j-1.2.8.jar"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/jpox-20041204.032009.jar"/>
<classpathentry kind="lib" path="web/WEB-INF/lib/magicmap-db-layer.jar"/>
<classpathentry kind="lib" path="lib.dev/jasper-runtime.jar"/>
<classpathentry kind="lib" path="lib.dev/jsp-api.jar"/>
<classpathentry kind="lib" path="lib.dev/servlet-api.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/jpox-1.1.3.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/jdo2-api-2.0.jar"/>
<classpathentry kind="output" path="web/WEB-INF/classes"/>
</classpath>
Added: branches/newjpox/magicmapserver/dblayer/lib/jdo2-api-2.0.jar
===================================================================
(Binary files differ)
Property changes on: branches/newjpox/magicmapserver/dblayer/lib/jdo2-api-2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/newjpox/magicmapserver/dblayer/lib/jpox-1.1.0-beta-1.jar
===================================================================
(Binary files differ)
Added: branches/newjpox/magicmapserver/dblayer/lib/jpox-1.1.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/newjpox/magicmapserver/dblayer/lib/jpox-1.1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/newjpox/magicmapserver/dblayer/lib/jpox-enhancer-1.1.0-beta-1.jar
===================================================================
(Binary files differ)
Added: branches/newjpox/magicmapserver/dblayer/lib/jpox-enhancer-1.1.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/newjpox/magicmapserver/dblayer/lib/jpox-enhancer-1.1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/AccessPoint.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/AccessPoint.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/AccessPoint.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -12,12 +12,6 @@
* vendor-name="jpox"
* key="table-name"
* value="accesspoint"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class AccessPoint {
@@ -34,6 +28,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
@@ -89,7 +84,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="ScanResult"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="accessPoint"
**/
Collection scanResults = new HashSet();
@@ -101,7 +96,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="Position"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="accessPoint"
*/
Collection positions = new HashSet();
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Client.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Client.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Client.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -16,12 +16,6 @@
* vendor-name="jpox"
* key="table-name"
* value="client"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class Client {
@@ -38,6 +32,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
@@ -88,7 +83,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="ScanResult"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="client"
*/
Collection scanResults = new HashSet();
@@ -100,7 +95,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="Position"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="client"
*/
Collection positions = new HashSet();
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GeoPosition.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GeoPosition.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GeoPosition.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -10,12 +10,6 @@
* vendor-name="jpox"
* key="table-name"
* value="geoposition"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class GeoPosition {
@@ -32,6 +26,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GridField.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GridField.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/GridField.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -17,12 +17,6 @@
* vendor-name="jpox"
* key="table-name"
* value="gridfield"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class GridField {
@@ -39,6 +33,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Hardware.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Hardware.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Hardware.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -17,12 +17,6 @@
* vendor-name="jpox"
* key="table-name"
* value="hardware"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class Hardware {
@@ -39,6 +33,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Location.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Location.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Location.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -19,12 +19,6 @@
* vendor-name="jpox"
* key="table-name"
* value="location"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class Location {
@@ -40,6 +34,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Map.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Map.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Map.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -16,13 +16,6 @@
* vendor-name="jpox"
* key="table-name"
* value="map"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
- *
*/
public class Map {
@@ -38,6 +31,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
@@ -104,7 +98,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="GridField"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="map"
**/
Collection gridFields = new HashSet();
@@ -116,7 +110,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="Position"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="map"
**/
Collection positions = new HashSet();
@@ -128,7 +122,7 @@
* persistence-modifier="persistent"
* collection-type="collection"
* element-type="GeoPosition"
- * dependent="true"
+ * dependent-element="true"
* mapped-by="map"
**/
Collection geoPositions = new HashSet();
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Position.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Position.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Position.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -15,12 +15,6 @@
* vendor-name="jpox"
* key="table-name"
* value="position"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class Position {
@@ -37,6 +31,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/ScanResult.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/ScanResult.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/ScanResult.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -19,12 +19,6 @@
* vendor-name="jpox"
* key="table-name"
* value="scanresult"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class ScanResult {
@@ -41,6 +35,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Session.java
===================================================================
--- branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Session.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/dblayer/src/net/sf/magicmap/db/Session.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -14,12 +14,6 @@
* vendor-name="jpox"
* key="table-name"
* value="session"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="use-poid-generator"
- * value="true"
- * @jdo.class-vendor-extension
- * vendor-name="jpox" key="poid-class-generator"
- * value="org.jpox.poid.SequenceTablePoidGenerator"
*/
public class Session {
@@ -36,6 +30,7 @@
* @jdo.field
* persistence-modifier="persistent"
* primary-key="true"
+ * value-strategy="true"
*/
long id;
Modified: branches/newjpox/magicmapserver/src/net/sf/magicmap/server/Init.java
===================================================================
--- branches/newjpox/magicmapserver/src/net/sf/magicmap/server/Init.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/src/net/sf/magicmap/server/Init.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -49,7 +49,7 @@
properties.setProperty("javax.jdo.option.RestoreValues", "true");
properties.setProperty("org.jpox.cache.level2", "true");
- properties.setProperty("org.jpox.poid.generatorClass", "org.jpox.poid.SequenceTablePoidGenerator");
+ properties.setProperty("org.jpox.poid.generatorClass", "org.jpox.store.rdbms.poid.SequenceTablePoidGenerator");
JDOUtil.pmfactory = JDOHelper.getPersistenceManagerFactory(properties);
PersistenceManager pm = JDOUtil.pmfactory.getPersistenceManager();
Modified: branches/newjpox/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java
===================================================================
--- branches/newjpox/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java 2006-11-12 12:24:19 UTC (rev 482)
+++ branches/newjpox/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java 2006-11-12 12:36:33 UTC (rev 483)
@@ -15,6 +15,7 @@
import net.sf.magicmap.db.AccessPoint;
import net.sf.magicmap.db.Client;
import net.sf.magicmap.db.Map;
+import net.sf.magicmap.db.Position;
import net.sf.magicmap.db.Session;
import net.sf.magicmap.server.cache.PositionCache;
import net.sf.magicmap.server.dto.AccessPointDTO;
@@ -101,6 +102,18 @@
pos.setPosY(positionY);
pos.setPosZ(positionZ);
PositionCache.getPositionCache().createOrUpdatePosition(map, pos, client.getMac());
+
+// Position position = checkPosition(positionName, map, pm);
+// if (position == null){
+// position = new Position(map, positionX, positionY, positionZ, positionName);
+// pm.makePersistent(position);
+// }
+// position.setDeleted(false);
+// position.setPosX(positionX);
+// position.setPosY(positionY);
+// position.setFixed(fixed);
+//
+// setNewSignalCharacter(character, pm, client, position);
}
/**
Added: branches/newjpox/magicmapserver/web/WEB-INF/lib/jdo2-api-2.0.jar
===================================================================
(Binary files differ)
Property changes on: branches/newjpox/magicmapserver/web/WEB-INF/lib/jdo2-api-2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/newjpox/magicmapserver/web/WEB-INF/lib/jpox-1.1.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/newjpox/magicmapserver/web/WEB-INF/lib/jpox-1.1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/newjpox/magicmapserver/web/WEB-INF/lib/jpox-20041204.032009.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
