LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moves interface identifiable to package portation 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4063 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2016-05-09 15:19:24 +00:00
parent 20417722ce
commit 5247312d00
6 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-core/src/com/arsdigita/kernel/ACSObject.java
View File

@ -32,14 +32,12 @@ import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.ObjectType;
import com.arsdigita.persistence.metadata.Property; import com.arsdigita.persistence.metadata.Property;
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.SQLException; 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 * An ACSObject is a generic object that can be handled by any of a
* number of Core services e.g., versioning, permissions. Subclass * number of Core services e.g., versioning, permissions. Subclass

1
ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
View File

@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule; import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import com.arsdigita.kernel.Identifiable;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;

4
ccm-core/src/com/arsdigita/kernel/Identifiable.java → ccm-core/src/com/arsdigita/portation/Identifiable.java
View File

@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.kernel; package com.arsdigita.portation;
import com.arsdigita.portation.AbstractMarshaller;
/** /**
* @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a> * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>

1
ccm-core/src/com/arsdigita/portation/Marshaller.java
View File

@ -18,7 +18,6 @@
*/ */
package com.arsdigita.portation; package com.arsdigita.portation;
import com.arsdigita.kernel.Identifiable;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;

1
ccm-docrepo/src/com/arsdigita/docrepo/File.java
View File

@ -24,7 +24,6 @@ import com.arsdigita.mimetypes.MimeType;
import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID; import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.metadata.Property; import com.arsdigita.persistence.metadata.Property;
import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.util.Assert; import com.arsdigita.util.Assert;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.oro.text.perl.Perl5Util; import org.apache.oro.text.perl.Perl5Util;

3
ccm-sci-bundle/bundles/devel/cfg/integration.properties
View File

@ -222,7 +222,8 @@ waf.admin.password=sci2000
waf.admin.password.question=12345 waf.admin.password.question=12345
waf.admin.password.answer=6 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.runtime.jdbc_pool_size=30
waf.web.server=localhost\:8080 waf.web.server=localhost\:8080