You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fl...@apache.org on 2010/11/24 00:36:12 UTC
svn commit: r1038385 - in /lenya/trunk/org.apache.lenya.core.utils: ./
src/main/java/org/apache/lenya/cms/
src/main/java/org/apache/lenya/cms/cocoon/
src/main/java/org/apache/lenya/cms/cocoon/source/
src/main/java/org/apache/lenya/utils/test/ src/test/...
Author: florent
Date: Tue Nov 23 23:36:12 2010
New Revision: 1038385
URL: http://svn.apache.org/viewvc?rev=1038385&view=rev
Log:
- add SourceUtils to module
- solve a dependencie in pom
- try to move a test class utility
Added:
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/source/
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java
- copied, changed from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java
lenya/trunk/org.apache.lenya.core.utils/src/test/java/org/apache/lenya/utils/test/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/utils/test/
Removed:
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/utils/test/
Modified:
lenya/trunk/org.apache.lenya.core.utils/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.utils/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.utils/pom.xml?rev=1038385&r1=1038384&r2=1038385&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.utils/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.utils/pom.xml Tue Nov 23 23:36:12 2010
@@ -120,6 +120,11 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <!-- this dependency is added because the urlinformation class. See if we can remove this dependencie -->
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-publication-api</artifactId>
+ </dependency>
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
Copied: lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java (from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java?p2=lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java&p1=lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java&r1=1033911&r2=1038385&rev=1038385&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java Tue Nov 23 23:36:12 2010
@@ -38,8 +38,9 @@ import org.apache.excalibur.source.Sourc
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.cms.publication.RepositoryException;
-import org.apache.lenya.xml.DocumentHelper;
+//import org.apache.lenya.cms.publication.RepositoryException;
+//import org.apache.lenya.xml.DocumentHelper;
+import org.apache.lenya.utils.xml.DocumentHelper;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -527,7 +528,7 @@ public final class SourceUtil {
* @throws MalformedURLException If an error occurs.
* @throws IOException If an error occurs.
*/
- public static void checkout(String sourceUri, ServiceManager manager)
+ /*public static void checkout(String sourceUri, ServiceManager manager)
throws RepositoryException, ServiceException, MalformedURLException, IOException {
SourceResolver resolver = null;
DocumentSource source = null;
@@ -546,7 +547,7 @@ public final class SourceUtil {
manager.release(resolver);
}
}
- }
+ }*/
/**
* Checks in a transactionable source.
@@ -557,7 +558,7 @@ public final class SourceUtil {
* @throws MalformedURLException If an error occurs.
* @throws IOException If an error occurs.
*/
- public static void checkin(String sourceUri, ServiceManager manager)
+ /*public static void checkin(String sourceUri, ServiceManager manager)
throws RepositoryException, ServiceException, MalformedURLException, IOException {
SourceResolver resolver = null;
DocumentSource source = null;
@@ -576,7 +577,7 @@ public final class SourceUtil {
manager.release(resolver);
}
}
- }
+ }*/
/**
* Locks a transactionable source.
@@ -584,7 +585,7 @@ public final class SourceUtil {
* @param manager The service manager.
* @throws RepositoryException If an error occurs.
*/
- public static void lock(String sourceUri, ServiceManager manager) throws RepositoryException {
+ /*public static void lock(String sourceUri, ServiceManager manager) throws RepositoryException {
SourceResolver resolver = null;
DocumentSource source = null;
try {
@@ -604,7 +605,7 @@ public final class SourceUtil {
manager.release(resolver);
}
}
- }
+ }*/
/**
* Unlocks a transactionable source.
@@ -612,7 +613,7 @@ public final class SourceUtil {
* @param manager The service manager.
* @throws RepositoryException If an error occurs.
*/
- public static void unlock(String sourceUri, ServiceManager manager) throws RepositoryException {
+ /*public static void unlock(String sourceUri, ServiceManager manager) throws RepositoryException {
SourceResolver resolver = null;
DocumentSource source = null;
try {
@@ -632,14 +633,14 @@ public final class SourceUtil {
manager.release(resolver);
}
}
- }
+ }*/
/**
* Registers a source as dirty.
* @param sourceUri The source URI.
* @param manager The service manager.
*/
- public static void registerDirty(String sourceUri, ServiceManager manager) {
+ /*public static void registerDirty(String sourceUri, ServiceManager manager) {
SourceResolver resolver = null;
DocumentSource source = null;
try {
@@ -658,7 +659,7 @@ public final class SourceUtil {
manager.release(resolver);
}
}
- }
+ }*/
/**
* @param sourceUri The source URI.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org