From 5247312d00c9b7096ff10337cc83d974bf78b8e8 Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 9 May 2016 15:19:24 +0000
Subject: [PATCH] moves interface identifiable to package portation

git-svn-id: https://svn.libreccm.org/ccm/trunk@4063 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/src/com/arsdigita/kernel/ACSObject.java            | 6 ++----
 .../src/com/arsdigita/portation/AbstractMarshaller.java     | 1 -
 .../com/arsdigita/{kernel => portation}/Identifiable.java   | 4 +---
 ccm-core/src/com/arsdigita/portation/Marshaller.java        | 1 -
 ccm-docrepo/src/com/arsdigita/docrepo/File.java             | 1 -
 ccm-sci-bundle/bundles/devel/cfg/integration.properties     | 3 ++-
 6 files changed, 5 insertions(+), 11 deletions(-)
 rename ccm-core/src/com/arsdigita/{kernel => portation}/Identifiable.java (92%)

diff --git a/ccm-core/src/com/arsdigita/kernel/ACSObject.java b/ccm-core/src/com/arsdigita/kernel/ACSObject.java
index 8438854d3..4fa97a9c4 100755
--- a/ccm-core/src/com/arsdigita/kernel/ACSObject.java
+++ b/ccm-core/src/com/arsdigita/kernel/ACSObject.java
@@ -32,14 +32,12 @@ import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.PersistenceException;
 import com.arsdigita.persistence.metadata.ObjectType;
 import com.arsdigita.persistence.metadata.Property;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
 
 import java.math.BigDecimal;
 import java.sql.SQLException;
 
-import com.arsdigita.portation.AbstractMarshaller;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
-
 /**
  * An ACSObject is a generic object that can be handled by any of a
  * number of Core services e.g., versioning, permissions. Subclass
diff --git a/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java b/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
index 8faffe8ff..2ce599035 100644
--- a/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
+++ b/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import org.apache.log4j.Logger;
-import com.arsdigita.kernel.Identifiable;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/ccm-core/src/com/arsdigita/kernel/Identifiable.java b/ccm-core/src/com/arsdigita/portation/Identifiable.java
similarity index 92%
rename from ccm-core/src/com/arsdigita/kernel/Identifiable.java
rename to ccm-core/src/com/arsdigita/portation/Identifiable.java
index dfb4cd9db..f8b15fbf5 100644
--- a/ccm-core/src/com/arsdigita/kernel/Identifiable.java
+++ b/ccm-core/src/com/arsdigita/portation/Identifiable.java
@@ -16,9 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.kernel;
-
-import com.arsdigita.portation.AbstractMarshaller;
+package com.arsdigita.portation;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
diff --git a/ccm-core/src/com/arsdigita/portation/Marshaller.java b/ccm-core/src/com/arsdigita/portation/Marshaller.java
index 394876814..b70a8f873 100644
--- a/ccm-core/src/com/arsdigita/portation/Marshaller.java
+++ b/ccm-core/src/com/arsdigita/portation/Marshaller.java
@@ -18,7 +18,6 @@
  */
 package com.arsdigita.portation;
 
-import com.arsdigita.kernel.Identifiable;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
diff --git a/ccm-docrepo/src/com/arsdigita/docrepo/File.java b/ccm-docrepo/src/com/arsdigita/docrepo/File.java
index 85ce40053..48fe3f56b 100644
--- a/ccm-docrepo/src/com/arsdigita/docrepo/File.java
+++ b/ccm-docrepo/src/com/arsdigita/docrepo/File.java
@@ -24,7 +24,6 @@ import com.arsdigita.mimetypes.MimeType;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.metadata.Property;
-import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.util.Assert;
 import org.apache.log4j.Logger;
 import org.apache.oro.text.perl.Perl5Util;
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 5d72a47df..9154dce7a 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -222,7 +222,8 @@ waf.admin.password=sci2000
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified
+#waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci
+#&password\=sci47web&stringtype\=unspecified
 waf.runtime.jdbc_pool_size=30
 
 waf.web.server=localhost\:8080