Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: isis-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1331793 - in
 /incubator/isis/branches/0.3.0-incubating-NEW-OIDs:
 runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/
 runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/
 runtimes/dflt/objectstores/jpa/jpa-applib/src...
Date: Sat, 28 Apr 2012 16:50:59 -0000
To: isis-commits@incubator.apache.org
From: danhaywood@apache.org
Message-Id: <20120428165059.A34EE23889E3@eris.apache.org>

Author: danhaywood
Date: Sat Apr 28 16:50:58 2012
New Revision: 1331793

URL: http://svn.apache.org/viewvc?rev=1331793&view=rev
Log:
ISIS-214: fixing issue with running Scimpi against in-memory object store

Added:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/isis/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/isis/extensions/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/isis/extensions/jpa/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/isis/extensions/jpa/applib/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-applib/src/main/java/org/apache/isis/extensions/jpa/applib/usertypes/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_persist.java   (with props)
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java   (with props)
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java   (with props)
Modified:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java

Added: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_persist.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_persist.java?rev=1331793&view=auto
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_persist.java (added)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_persist.java Sat Apr 28 16:50:58 2012
@@ -0,0 +1,31 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.runtimes.dflt.objectstores.xml;
+
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
+import org.apache.isis.runtimes.dflt.testsupport.tck.ObjectStoreContractTest_persist;
+
+public class XmlObjectStoreTest_persist extends ObjectStoreContractTest_persist {
+
+    @Override
+    protected PersistenceMechanismInstaller createPersistenceMechanismInstaller() {
+        return new XmlPersistenceMechanismInstaller();
+    }
+}

Propchange: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_persist.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java?rev=1331793&view=auto
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java (added)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java Sat Apr 28 16:50:58 2012
@@ -0,0 +1,17 @@
+package org.apache.isis.tck.dom.sqlos.poly;
+
+
+public class EmptyInterfaceEx implements EmptyInterface {
+    // {{ Special
+    private String special;
+
+    public String getSpecial() {
+        return special;
+    }
+
+    public void setSpecial(final String special) {
+        this.special = special;
+    }
+
+    // }}
+}
\ No newline at end of file

Propchange: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java?rev=1331793&view=auto
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java (added)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java Sat Apr 28 16:50:58 2012
@@ -0,0 +1,23 @@
+package org.apache.isis.tck.dom.sqlos.poly;
+
+
+public class PolyInterfaceEx implements PolyInterface {
+    // {{ String
+    private String string;
+
+    @Override
+    public String getString() {
+        return string;
+    }
+
+    public void setString(final String string) {
+        this.string = string;
+    }
+
+    // }}
+
+    public String getSpecial() {
+        return "special";
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java?rev=1331793&r1=1331792&r2=1331793&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java Sat Apr 28 16:50:58 2012
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 
 import org.apache.log4j.Logger;
@@ -339,9 +340,12 @@ public class DefaultOidObjectMapping imp
     @Override
     public ObjectAdapter mappedObject(final String id) {
         final char type = id.charAt(0);
+        
+        // Pdom.todo.ToDoItem@OID:TODO:6
         final String[] split = id.split("@");
-        final String objectType = split[0].substring(1);
         final String oidData = split[1];
+        final String[] oidDataArray = oidData.split(":");
+        final String objectType = oidDataArray[1];
         final String aggregatedId = split.length > 2?split[2]:null;
             
         // HACK - to remove after fix!