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 2011/09/26 11:06:27 UTC
svn commit: r1175728 [1/2] - in /lenya/trunk: ./ externals/
org.apache.lenya.core.api/
org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/
org.apache.lenya.core.api/src/test/java/org/
org.apache.lenya.core.document.api/ org.apache.leny...
Author: florent
Date: Mon Sep 26 09:06:23 2011
New Revision: 1175728
URL: http://svn.apache.org/viewvc?rev=1175728&view=rev
Log:
moving classes, really minimum compilation
Added:
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/ResourceNotFoundException.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/metadata/
- copied from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/metadata/
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java
- copied unchanged from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
- copied unchanged from r1096979, lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventDescriptor.java
- copied unchanged from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventDescriptor.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryListener.java
- copied unchanged from r1096979, lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryListener.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
lenya/trunk/org.apache.lenya.core.session.api/
lenya/trunk/org.apache.lenya.core.session.api/pom.xml
lenya/trunk/org.apache.lenya.core.session.api/rcl.properties
lenya/trunk/org.apache.lenya.core.session.api/src/
lenya/trunk/org.apache.lenya.core.session.api/src/main/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/cms/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/cms/publication/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/cms/publication/Session.java
- copied unchanged from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/cms/repository/
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/cms/repository/Session.java
- copied unchanged from r1073181, lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Session.java
lenya/trunk/org.apache.lenya.core.session.api/src/main/java/org/apache/lenya/cms/repository/SessionHolder.java
- copied unchanged from r1073181, lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SessionHolder.java
lenya/trunk/org.apache.lenya.core.session.api/src/main/resources/
lenya/trunk/org.apache.lenya.core.session.api/src/main/resources/COB-INF/
lenya/trunk/org.apache.lenya.core.session.api/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.session.api/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.session.api/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.session.api/src/test/
lenya/trunk/org.apache.lenya.core.session.api/src/test/java/
lenya/trunk/org.apache.lenya.core.session.impl/
lenya/trunk/org.apache.lenya.core.session.impl/pom.xml
lenya/trunk/org.apache.lenya.core.session.impl/rcl.properties
lenya/trunk/org.apache.lenya.core.session.impl/src/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/lenya/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/lenya/cms/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/lenya/cms/publication/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/lenya/cms/repository/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
- copied, changed from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
lenya/trunk/org.apache.lenya.core.session.impl/src/main/resources/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/resources/COB-INF/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.session.impl/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.session.impl/src/test/
lenya/trunk/org.apache.lenya.core.session.impl/src/test/java/
lenya/trunk/org.apache.lenya.core.transaction.impl/src/test/java/transaction/
- copied from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/test/java/org/apache/lenya/transaction/
Removed:
lenya/trunk/org.apache.lenya.core.api/src/test/java/org/
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryListener.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventDescriptor.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/metadata/
lenya/trunk/org.apache.lenya.core.repository.impl/src/test/java/org/apache/lenya/transaction/
Modified:
lenya/trunk/externals/build.sh
lenya/trunk/org.apache.lenya.core.api/pom.xml
lenya/trunk/org.apache.lenya.core.document.api/pom.xml
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuildException.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentException.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentVisitor.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java
lenya/trunk/org.apache.lenya.core.metadata.api/pom.xml
lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataOwner.java
lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/dublincore/DublinCore.java
lenya/trunk/org.apache.lenya.core.observation/pom.xml
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/DocumentEventSource.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteManager.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java
lenya/trunk/org.apache.lenya.core.repository.impl/pom.xml
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryItemFactoryWrapper.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryManagerImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java
lenya/trunk/org.apache.lenya.core.transaction.api/pom.xml
lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/TransactionException.java
lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/UnitOfWork.java
lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
lenya/trunk/org.apache.lenya.webapp/pom.xml
lenya/trunk/pom.xml
Modified: lenya/trunk/externals/build.sh
URL: http://svn.apache.org/viewvc/lenya/trunk/externals/build.sh?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/externals/build.sh (original)
+++ lenya/trunk/externals/build.sh Mon Sep 26 09:06:23 2011
@@ -38,6 +38,14 @@ echo "Apply patch to cocoon issue COCOON
echo "============================================="
patch -N -p0 < cocoon-sitemaptags2daisy-plugin.patch
+# Invoke patch
+echo ""
+echo ""
+echo "============================================="
+echo "Apply patch to cocoon test fail (comment test), TODO : report this issue"
+echo "============================================="
+patch -N -p0 < image-op-test-fail.patch
+
# Invoke maven
cd cocoon-rev-959219
@@ -49,6 +57,8 @@ export MAVEN_OPTS="-Xmx1024m -Xms512m"
#"-Xmx256m"
#mvn install
-mvn -P allblocks -Dmaven.test.skip=true install
+# remove test skiping as some dependencies are on test jar
+#mvn -P allblocks -Dmaven.test.skip=true install
+mvn -P allblocks install
echo $MAVEN_OPTS
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.core.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/pom.xml?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.api/pom.xml Mon Sep 26 09:06:23 2011
@@ -14,70 +14,97 @@
<artifactId>lenya-core-api</artifactId>
<packaging>jar</packaging>
<name>Apache Lenya Core API</name>
-
+
+ <!-- TODO : see how to rename it and extract xml related stuff (merge with core-impl one)
+ TODO : see how to clean the build and properties parts
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<properties>
<lenya.home>${basedir}/..</lenya.home>
</properties>
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.servlet</groupId>-->
+<!-- <artifactId>servlet-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-flowscript-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-validation-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-serializers-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-chaperon-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-xsp-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-util</artifactId>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-core</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-flowscript-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>commons-validator</groupId>-->
+<!-- <artifactId>commons-validator</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-validation-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-serializers-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-chaperon-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-xsp-impl</artifactId>-->
+<!-- <version>1.0.0-SNAPSHOT</version>-->
+<!-- </dependency>-->
<!-- Tests -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>junit</groupId>-->
+<!-- <artifactId>junit</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-core</artifactId>-->
+<!-- <type>test-jar</type>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<!-- FIXME: This dependency is transitive and should be obtained automatically
see http://jira.codehaus.org/browse/MNG-1378 -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-sitemap-impl</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-sitemap-impl</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- <type>test-jar</type>-->
+<!-- </dependency>-->
</dependencies>
</project>
Copied: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/ResourceNotFoundException.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/ResourceNotFoundException.java?p2=lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/ResourceNotFoundException.java&p1=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/exceptions/ResourceNotFoundException.java Mon Sep 26 09:06:23 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.publication;
+package org.apache.lenya.exceptions;
public class ResourceNotFoundException extends RuntimeException {
Modified: lenya/trunk/org.apache.lenya.core.document.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/pom.xml?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/pom.xml Mon Sep 26 09:06:23 2011
@@ -12,48 +12,56 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-document-api</artifactId>
<packaging>jar</packaging>
- <name>Apache Lenya Document</name>
+ <name>Apache Lenya Document API</name>
<description>API for Lenya Document</description>
<dependencies>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-repository-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-transaction-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-metadata-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
- <!-- TODO : see if all theses dependencies are required -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-servlet-service-components</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-template-impl</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-repository-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-transaction-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-flowscript-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata-api</artifactId>
</dependency>
+<!-- TODO : see if all theses dependencies are required -->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-core</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-servlet-service-components</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-template-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-flowscript-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.servlet</groupId>-->
+<!-- <artifactId>servlet-api</artifactId>-->
+<!-- <version>2.4</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-pipeline-api</artifactId>
+</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+</dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java Mon Sep 26 09:06:23 2011
@@ -27,16 +27,20 @@ import org.apache.lenya.cms.publication.
//florent : removed import as they create cyclic dependencies
/*import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.publication.Node;*/
-import org.apache.lenya.cms.repository.Node;
-import org.apache.lenya.cms.repository.History;
-import org.apache.lenya.cms.repository.RepositoryException;
+//florent remove to change way of dependency : it's now repository that depend to document
+//import org.apache.lenya.cms.repository.Node;
+//import org.apache.lenya.cms.repository.History;
+//import org.apache.lenya.cms.repository.RepositoryException;
+
+//TODO : this include a dependency to cocoon-pipeline-api... see how to remove it as it a lot for a less...
import org.apache.cocoon.ResourceNotFoundException;
/**
* A CMS document.
*/
-public interface Document extends Node, MetaDataOwner {
-
+//florent : not still repository dependent
+//public interface Document extends Node, MetaDataOwner {
+public interface Document extends MetaDataOwner {
/**
* The document namespace URI.
*/
@@ -343,13 +347,14 @@ public interface Document extends Node,
* @return A revision.
* @throws RepositoryException if the revision doesn't exist.
*/
- Document getRevision(int i) throws RepositoryException;
+ //florent Document getRevision(int i) throws RepositoryException;
+ Document getRevision(int i) throws DocumentException;
/**
* @return The revision number of this document.
*/
int getRevisionNumber();
- History getHistory();
+ //History getHistory();
}
Modified: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuildException.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuildException.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuildException.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuildException.java Mon Sep 26 09:06:23 2011
@@ -18,7 +18,7 @@
package org.apache.lenya.cms.publication;
-import org.apache.lenya.cms.repository.RepositoryException;
+//import org.apache.lenya.cms.repository.RepositoryException;
/**
* Document build exception.
@@ -26,7 +26,9 @@ import org.apache.lenya.cms.repository.R
*/
//florent : change exceptions extension in order to repect dependencies
//public class DocumentBuildException extends PublicationException {
-public class DocumentBuildException extends RepositoryException {
+//florent : now remove dependency to repository
+//public class DocumentBuildException extends RepositoryException {
+public class DocumentBuildException extends DocumentException {
/**
*
Copied: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java?p2=lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java&p1=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java Mon Sep 26 09:06:23 2011
@@ -21,7 +21,7 @@
package org.apache.lenya.cms.publication;
import java.net.MalformedURLException;
-import org.apache.lenya.cms.publication.Session;
+//import org.apache.lenya.cms.publication.Session;
//import from core-document-api
import org.apache.lenya.cms.publication.DocumentLocator;
/**
@@ -41,7 +41,8 @@ public interface DocumentBuilder {
* @return A document identifier.
* @throws MalformedURLException if the URL is not a webapp URL.
*/
- DocumentLocator getLocator(Session session, String webappUrl) throws MalformedURLException;
+ //florent DocumentLocator getLocator(Session session, String webappUrl) throws MalformedURLException;
+ DocumentLocator getLocator(String webappUrl) throws MalformedURLException;
/**
* Checks if an URL corresponds to a CMS document.
@@ -50,7 +51,8 @@ public interface DocumentBuilder {
* @return A boolean value.
* @throws DocumentBuildException when something went wrong.
*/
- boolean isDocument(Session session, String url);
+ //boolean isDocument(Session session, String url);
+ boolean isDocument(String url);
/**
* Builds an URL corresponding to a CMS document.
@@ -58,7 +60,8 @@ public interface DocumentBuilder {
* @param locator The locator.
* @return a String The corresponding URL.
*/
- String buildCanonicalUrl(Session session, DocumentLocator locator);
+ //String buildCanonicalUrl(Session session, DocumentLocator locator);
+ String buildCanonicalUrl(DocumentLocator locator);
/**
* Checks if a document name is valid.
Modified: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentException.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentException.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentException.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentException.java Mon Sep 26 09:06:23 2011
@@ -20,14 +20,15 @@
package org.apache.lenya.cms.publication;
-import org.apache.lenya.cms.repository.RepositoryException;
+//import org.apache.lenya.cms.repository.RepositoryException;
/**
* Document exception
*/
//florent : change exceptions extension in order to repect dependencies
//public class DocumentException extends PublicationException {
-public class DocumentException extends RepositoryException {
+//public class DocumentException extends RepositoryException {
+public class DocumentException extends Exception {
/**
*
Copied: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java?p2=lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java&p1=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java Mon Sep 26 09:06:23 2011
@@ -17,6 +17,7 @@
*/
package org.apache.lenya.cms.publication;
+import org.apache.lenya.exceptions.ResourceNotFoundException;
/**
* A DocumentIdentityMap avoids the multiple instanciation of a document object.
*
@@ -40,7 +41,9 @@ public interface DocumentFactory {
* @return A document.
* @throws ResourceNotFoundException if the document does not exist.
*/
- Document get(Publication publication, String area, String uuid, String language)
+ //florent : document don't depend on a publication or area
+ //Document get(Publication publication, String area, String uuid, String language)
+ Document get(String uuid, String language)
throws ResourceNotFoundException;
/**
@@ -53,7 +56,8 @@ public interface DocumentFactory {
* @return A document.
* @throws ResourceNotFoundException if the document does not exist.
*/
- Document get(Publication publication, String area, String uuid, String language, int revision)
+ //florent Document get(Publication publication, String area, String uuid, String language, int revision)
+ Document get(String uuid, String language, int revision)
throws ResourceNotFoundException;
/**
@@ -72,7 +76,8 @@ public interface DocumentFactory {
* @return A document.
* @throws ResourceNotFoundException if an error occurs.
*/
- Document get(Publication publication, String area, String uuid)
+ //florent Document get(Publication publication, String area, String uuid)
+ Document get(String uuid)
throws ResourceNotFoundException;
/**
@@ -85,28 +90,28 @@ public interface DocumentFactory {
/**
* @return The session.
*/
- Session getSession();
+ //Session getSession();
/**
* @param id The publication ID.
* @return A publication.
* @throws PublicationException if the publication does not exist.
*/
- Publication getPublication(String id) throws PublicationException;
+ //Publication getPublication(String id) throws PublicationException;
/**
* @return All publication IDs.
*/
- String[] getPublicationIds();
+ //String[] getPublicationIds();
/**
* @param id The publication ID.
* @return If a publication with this ID exists.
*/
- boolean existsPublication(String id);
+ /*boolean existsPublication(String id);
void setPublicationManager(PublicationManager pubManager);
- PublicationManager getPublicationManager();
+ PublicationManager getPublicationManager();*/
}
Copied: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java?p2=lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java&p1=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java Mon Sep 26 09:06:23 2011
@@ -27,6 +27,7 @@ public interface DocumentFactoryBuilder
* @param session The session.
* @return A document identity map.
*/
- DocumentFactory createDocumentFactory(Session session);
+ //florent DocumentFactory createDocumentFactory(Session session);
+ DocumentFactory createDocumentFactory();
}
Copied: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java?p2=lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java&p1=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java Mon Sep 26 09:06:23 2011
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.publication;
-import org.apache.lenya.cms.publication.util.DocumentSet;
+//import org.apache.lenya.cms.publication.util.DocumentSet;
/**
* Helper to manage documents. It takes care of attachments etc.
Modified: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentVisitor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentVisitor.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentVisitor.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentVisitor.java Mon Sep 26 09:06:23 2011
@@ -16,8 +16,6 @@
*
*/
-/* $Id$ */
-
package org.apache.lenya.cms.publication.util;
import org.apache.lenya.cms.publication.Document;
Copied: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java?p2=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java Mon Sep 26 09:06:23 2011
@@ -23,13 +23,12 @@ import java.net.MalformedURLException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.cms.site.SiteNode;
-
+import org.apache.lenya.utils.URLInformation;
/**
* Default document builder implementation.
- *
- * @version $Id$
*/
public class DefaultDocumentBuilder extends AbstractLogEnabled implements DocumentBuilder,
Serviceable, ThreadSafe {
@@ -99,11 +98,14 @@ public class DefaultDocumentBuilder exte
return suffix;
}
- public boolean isDocument(Session session, String url) {
+ //florent : public boolean isDocument(Session session, String url) {
+ public boolean isDocument(String url) {
try {
- DocumentLocator locator = getLocatorWithoutCheck(session, url);
+ //DocumentLocator locator = getLocatorWithoutCheck(session, url);
+ DocumentLocator locator = getLocatorWithoutCheck(url);
if (locator != null) {
- Publication pub = session.getPublication(locator.getPublicationId());
+ //Publication pub = session.getPublication(locator.getPublicationId());
+ Publication pub = (Publication)WebAppContextUtils.getCurrentWebApplicationContext().getBean(Publication.class.getName()+"/"+locator.getPublicationId());
String path = locator.getPath();
Area area = pub.getArea(locator.getArea());
if (area.getSite().contains(path)) {
@@ -126,12 +128,14 @@ public class DefaultDocumentBuilder exte
* @param locator The document locator.
* @return A string.
*/
- protected String buildCanonicalDocumentUrl(Session session, DocumentLocator locator) {
+ //florent : protected String buildCanonicalDocumentUrl(Session session, DocumentLocator locator) {
+ protected String buildCanonicalDocumentUrl(DocumentLocator locator) {
String languageSuffix = "";
String language = locator.getLanguage();
- Publication pub = session.getPublication(locator.getPublicationId());
+ //florent : Publication pub = session.getPublication(locator.getPublicationId());
+ Publication pub = (Publication)WebAppContextUtils.getCurrentWebApplicationContext().getBean(Publication.class.getName()+"/"+locator.getPublicationId());
if (!language.equals(pub.getDefaultLanguage())) {
languageSuffix = "_" + language;
@@ -140,16 +144,20 @@ public class DefaultDocumentBuilder exte
return locator.getPath() + languageSuffix + ".html";
}
- public String buildCanonicalUrl(Session session, DocumentLocator doc) {
+ //florent public String buildCanonicalUrl(Session session, DocumentLocator doc) {
+ public String buildCanonicalUrl(DocumentLocator doc) {
- String documentUrl = buildCanonicalDocumentUrl(session, doc);
+ //String documentUrl = buildCanonicalDocumentUrl(session, doc);
+ String documentUrl = buildCanonicalDocumentUrl(doc);
String url = "/" + doc.getPublicationId() + "/" + doc.getArea() + documentUrl;
return url;
}
- public DocumentLocator getLocator(Session session, String webappUrl) throws MalformedURLException {
+ //florent public DocumentLocator getLocator(Session session, String webappUrl) throws MalformedURLException {
+ public DocumentLocator getLocator(String webappUrl) throws MalformedURLException {
- DocumentLocator locator = getLocatorWithoutCheck(session, webappUrl);
+ //DocumentLocator locator = getLocatorWithoutCheck(session, webappUrl);
+ DocumentLocator locator = getLocatorWithoutCheck(webappUrl);
if (locator == null) {
throw new ResourceNotFoundException("The webapp URL [" + webappUrl
+ "] does not refer to a document!");
@@ -166,7 +174,9 @@ public class DefaultDocumentBuilder exte
* refer to a locator.
* @throws MalformedURLException if the URL is not a webapp URL.
*/
- protected DocumentLocator getLocatorWithoutCheck(Session session, String webappUrl) throws MalformedURLException {
+ //florent : protected DocumentLocator getLocatorWithoutCheck(Session session, String webappUrl) throws MalformedURLException {
+ //TODO : remove the webappUrl param, not used
+ protected DocumentLocator getLocatorWithoutCheck(String webappUrl) throws MalformedURLException {
if (!webappUrl.startsWith("/")) {
return null;
@@ -175,9 +185,10 @@ public class DefaultDocumentBuilder exte
return null;
}
- URLInformation info = new URLInformation(webappUrl);
+ URLInformation info = new URLInformation();
- Publication publication = session.getPublication(info.getPublicationId());
+ //Publication publication = session.getPublication(info.getPublicationId());
+ Publication publication = (Publication)WebAppContextUtils.getCurrentWebApplicationContext().getBean(Publication.class.getName()+"/"+info.getPublicationId());
String documentURL = info.getDocumentUrl();
documentURL = removeExtensions(documentURL);
Modified: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java Mon Sep 26 09:06:23 2011
@@ -265,7 +265,8 @@ public class DocumentFactoryImpl impleme
* @see org.apache.lenya.transaction.IdentifiableFactory#build(org.apache.lenya.transaction.IdentityMap,
* java.lang.String)
*/
- public RepositoryItem buildItem(org.apache.lenya.cms.repository.Session session, String key) throws RepositoryException {
+ //florent : public RepositoryItem buildItem(org.apache.lenya.cms.repository.Session session, String key) throws RepositoryException {
+ public RepositoryItem buildItem(String key) throws RepositoryException {
if (logger.isDebugEnabled())
logger.debug("DocumentFactory::build() called with key [" + key + "]");
Modified: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java Mon Sep 26 09:06:23 2011
@@ -199,7 +199,7 @@ public class DocumentImpl implements Doc
public String getLanguage() {
return this.identifier.getLanguage();
}
-
+
public String[] getLanguages() {
List documentLanguages = new ArrayList();
Modified: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java Mon Sep 26 09:06:23 2011
@@ -26,6 +26,7 @@ import java.util.WeakHashMap;
* document doesn't have to exist.
* It helps to locate a document inside a publication
*/
+//@deprecated move this locator outside of document, have to move in "publication"
public class DocumentLocatorImpl implements DocumentLocator {
private static Map locators = new WeakHashMap();
Copied: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (from r1073181, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?p2=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Mon Sep 26 09:06:23 2011
@@ -223,6 +223,8 @@ public class DocumentManagerImpl extends
}
}
+ //Florent : move to repositoryimpl. this is the place to save a document
+ /*
protected void create(InputStream stream, Document document) throws Exception {
// Read initial contents as DOM
@@ -232,8 +234,9 @@ public class DocumentManagerImpl extends
+ "]");
copy(getSourceResolver(), stream, document);
- }
-
+ }*/
+ //Florent : move to repositoryimpl. this is the place to save a document
+ /*
protected void copy(SourceResolver resolver, InputStream sourceInputStream, Document destination)
throws IOException {
@@ -259,7 +262,7 @@ public class DocumentManagerImpl extends
sourceInputStream.close();
}
}
- }
+ }*/
//florent commented cause of change in document api
/*
@@ -870,15 +873,7 @@ public class DocumentManagerImpl extends
return document;
}*/
-
- public SourceResolver getSourceResolver() {
- return sourceResolver;
- }
-
- public void setSourceResolver(SourceResolver sourceResolver) {
- this.sourceResolver = sourceResolver;
- }
-
+
public UUIDGenerator getUuidGenerator() {
return uuidGenerator;
}
Modified: lenya/trunk/org.apache.lenya.core.metadata.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.api/pom.xml?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.api/pom.xml Mon Sep 26 09:06:23 2011
@@ -15,30 +15,4 @@
<name>Apache Lenya Metadata API</name>
<description>API for Lenya Metadata</description>
- <dependencies>
-
- <!-- TODO : see if all theses dependencies are required -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-servlet-service-components</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-template-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-flowscript-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataOwner.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataOwner.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataOwner.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataOwner.java Mon Sep 26 09:06:23 2011
@@ -20,7 +20,6 @@ package org.apache.lenya.cms.metadata;
/**
* Owner of meta-data.
*
- * @version $Id$
*/
public interface MetaDataOwner {
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml Mon Sep 26 09:06:23 2011
@@ -13,7 +13,7 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-metadata-impl</artifactId>
<packaging>jar</packaging>
- <name>Apache Lenya Core Metadata Implementation</name>
+ <name>Apache Lenya Metadata Implementation</name>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/dublincore/DublinCore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/dublincore/DublinCore.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/dublincore/DublinCore.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/dublincore/DublinCore.java Mon Sep 26 09:06:23 2011
@@ -28,7 +28,6 @@ import org.apache.lenya.cms.metadata.Met
* The descriptions are citing the <a href="http://www.dublincore.org">Dublin Core website </a>.
* </p>
*
- * @version $Id$
*/
public interface DublinCore extends MetaData {
Modified: lenya/trunk/org.apache.lenya.core.observation/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/pom.xml?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.observation/pom.xml Mon Sep 26 09:06:23 2011
@@ -13,7 +13,7 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-observation</artifactId>
<packaging>jar</packaging>
- <name>Apache Lenya Core Observation</name>
+ <name>Apache Lenya Observation</name>
<dependencies>
<!-- <dependency>-->
<!-- <groupId>org.apache.avalon.framework</groupId>-->
@@ -23,17 +23,25 @@
<!-- <groupId>org.apache.lenya</groupId>-->
<!-- <artifactId>lenya-core-api</artifactId>-->
<!-- </dependency>-->
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-repository-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-document-api</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-repository-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-document-api</artifactId>-->
+<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.lenya</groupId>-->
<!-- <artifactId>lenya-core-publication</artifactId>-->
<!-- </dependency>-->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/DocumentEventSource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/DocumentEventSource.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/DocumentEventSource.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/DocumentEventSource.java Mon Sep 26 09:06:23 2011
@@ -18,13 +18,14 @@
package org.apache.lenya.cms.observation;
import org.apache.commons.lang.Validate;
-import org.apache.lenya.cms.publication.Document;
+//florent : change concept of observation
+/*import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentIdentifier;
import org.apache.lenya.cms.publication.ResourceType;
-
+*/
public class DocumentEventSource {
- private DocumentIdentifier identifier;
+ /* private DocumentIdentifier identifier;
private ResourceType resourceType;
public DocumentEventSource(Document doc) {
@@ -39,5 +40,5 @@ public class DocumentEventSource {
public ResourceType getResourceType() {
return resourceType;
}
-
+ */
}
Modified: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java Mon Sep 26 09:06:23 2011
@@ -25,8 +25,9 @@ import java.util.Set;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.lang.Validate;
-import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.DocumentIdentifier;
+//florent : change observation
+//import org.apache.lenya.cms.publication.Document;
+//import org.apache.lenya.cms.publication.DocumentIdentifier;
/**
* Observation manager. Works as an observation registry and sends the notifications.
@@ -38,23 +39,26 @@ public class ObservationManager extends
public synchronized void registerListener(RepositoryListener listener, Object observeable)
throws ObservationException {
- Document doc = (Document) observeable;
+ //florent
+ /*Document doc = (Document) observeable;
Set listeners = getListeners(doc.getIdentifier());
if (listeners.contains(listener)) {
throw new ObservationException("The listener [" + listener
+ "] is already registered for the document [" + doc + "].");
}
- listeners.add(listener);
+ listeners.add(listener);*/
}
-
- protected Set getListeners(DocumentIdentifier doc) {
+
+ //florent : change observation management
+ /*
+ protected Set getListeners(DocumentIdentifier doc) {
Set listeners = (Set) this.identifier2listeners.get(doc);
if (listeners == null) {
listeners = new HashSet();
this.identifier2listeners.put(doc, listeners);
}
return listeners;
- }
+ }*/
public synchronized void registerListener(RepositoryListener listener)
throws ObservationException {
@@ -64,6 +68,7 @@ public class ObservationManager extends
this.listeners.add(listener);
}
+ /*
protected Set getAllListeners(DocumentIdentifier doc) {
Set allListeners = new HashSet();
synchronized (this) {
@@ -71,7 +76,7 @@ public class ObservationManager extends
allListeners.addAll(getListeners(doc));
}
return allListeners;
- }
+ }*/
protected void notify(Set listeners, RepositoryEvent event) {
for (Iterator i = listeners.iterator(); i.hasNext();) {
@@ -82,13 +87,14 @@ public class ObservationManager extends
public void eventFired(RepositoryEvent event) {
Validate.notNull(event);
- Set listeners;
+ Set listeners = this.listeners;
Object source = event.getSource();
if (source instanceof DocumentEventSource) {
+ //florent
+ /*
DocumentIdentifier id = ((DocumentEventSource) source).getIdentifier();
listeners = getAllListeners(id);
- } else {
- listeners = this.listeners;
+ */
}
notify(listeners, event);
}
Copied: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java (from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java?p2=lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java Mon Sep 26 09:06:23 2011
@@ -19,15 +19,16 @@ package org.apache.lenya.cms.observation
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.lenya.cms.publication.Document;
+//import org.apache.lenya.cms.publication.Document;
//florent import org.apache.lenya.cms.publication.DocumentImpl;
-import org.apache.lenya.cms.publication.Publication;
+/*import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.repository.Node;
-import org.apache.lenya.cms.repository.Session;
+import org.apache.lenya.cms.repository.Session;*/
/**
* Factory to create repository events.
*/
+//public class RepositoryEventFactory implements RepositoryEventFactory {
public class RepositoryEventFactory {
private static final Log logger = LogFactory.getLog(RepositoryEventFactory.class);
@@ -38,8 +39,11 @@ public class RepositoryEventFactory {
* @param descriptor The descriptor.
* @return An event.
*/
- public static final RepositoryEvent createEvent(Session session, Object descriptor) {
+ /*public static final RepositoryEvent createEvent(Session session, Object descriptor) {
return new RepositoryEventImpl(session, descriptor);
+ }*/
+ public static final RepositoryEvent createEvent(Object descriptor) {
+ return new RepositoryEventImpl(descriptor);
}
/**
@@ -68,6 +72,7 @@ public class RepositoryEventFactory {
* @param descriptor The descriptor.
* @return An event.
*/
+ /*
public static final RepositoryEvent createEvent(Node node, Object descriptor) {
RepositoryEvent event;
Document doc = null;
@@ -81,13 +86,14 @@ public class RepositoryEventFactory {
event.setNodeUri(node.getSourceURI());
}
return event;
- }
+ }*/
/**
* @param node The node.
* @return The document represented by the node or <code>null</code> if the node doesn't
* represent a document.
*/
+ /*
protected static final Document getDocument(Node node) {
final String sourceUri = node.getSourceURI();
@@ -131,6 +137,6 @@ public class RepositoryEventFactory {
throw new RuntimeException(e);
}
return doc;
- }
+ }*/
}
Copied: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java (from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java?p2=lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventImpl.java Mon Sep 26 09:06:23 2011
@@ -18,14 +18,14 @@
package org.apache.lenya.cms.observation;
import org.apache.commons.lang.Validate;
-import org.apache.lenya.cms.repository.Session;
+//florent session remove import org.apache.lenya.cms.repository.Session;
/**
* A repository event provides additional information if a document was added, changed, or removed.
*/
public class RepositoryEventImpl implements RepositoryEvent {
- private Session session;
+ //private Session session;
private Object descriptor = null;
private int revision = -1;
private Object source;
@@ -36,8 +36,10 @@ public class RepositoryEventImpl impleme
* @param source The source of the event.
* @param descriptor More information about the event.
*/
- public RepositoryEventImpl(Session session, Object source, Object descriptor) {
- this(session, descriptor);
+ //florent public RepositoryEventImpl(Session session, Object source, Object descriptor) {
+ public RepositoryEventImpl(Object source, Object descriptor) {
+ //this(session, descriptor);
+ this(descriptor);
Validate.notNull(source);
this.source = source;
}
@@ -47,19 +49,22 @@ public class RepositoryEventImpl impleme
* @param session The session.
* @param descriptor More information about the event.
*/
- public RepositoryEventImpl(Session session, Object descriptor) {
- Validate.notNull(session);
+ //florent public RepositoryEventImpl(Session session, Object descriptor) {
+ public RepositoryEventImpl(Object descriptor) {
+ //Validate.notNull(session);
Validate.notNull(descriptor);
- this.session = session;
+ //this.session = session;
this.descriptor = descriptor;
}
/**
* @return The session.
*/
+ //florent
+ /*
public Session getSession() {
return this.session;
- }
+ }*/
/**
* @return The descriptor.
@@ -72,7 +77,9 @@ public class RepositoryEventImpl impleme
* @see org.apache.lenya.cms.observation.RepositoryEvent#toString()
*/
public String toString() {
- return "identity:" + getSession().getIdentity().toString() + " " + getNodeUri() + " " + getDescriptor();
+ //florent : peut être qu'il faudrait passer l'identity en paramètre plutot que la session ?
+ // return "identity:" + getSession().getIdentity().toString() + " " + getNodeUri() + " " + getDescriptor();
+ return "identity:" + "TODO see repositoryEventImpl Classe" + " " + getNodeUri() + " " + getDescriptor();
}
private String nodeUri;
Copied: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java (from r1073181, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java?p2=lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java&r1=1073181&r2=1175728&rev=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java Mon Sep 26 09:06:23 2011
@@ -35,7 +35,7 @@ public class RepositoryLogger extends Ab
public void eventFired(RepositoryEvent event) {
getLogger().info(event.toString());
}
-
+
public void start() throws Exception {
ObservationRegistry registry = null;
try {
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java Mon Sep 26 09:06:23 2011
@@ -257,7 +257,7 @@ public interface Publication {
/**
* @return The session this publication object belongs to.
*/
- Session getSession();
+ //Session getSession();
/**
* @return The source URI of the publication directory.
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java Mon Sep 26 09:06:23 2011
@@ -34,6 +34,13 @@ public interface PublicationManager {
Publication[] getPublications(DocumentFactory factory);
/**
+ * get a publication from his id from spring
+ * @param pubID the publication id
+ * @return a publication
+ */
+ Publication getPublication(String pubID);
+
+ /**
* @param factory The factory.
* @param id The publication ID.
* @return A publication.
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java Mon Sep 26 09:06:23 2011
@@ -18,14 +18,15 @@
package org.apache.lenya.cms.publication;
import javax.servlet.http.HttpServletRequest;
-import org.apache.lenya.cms.publication.Session;
+//import org.apache.lenya.cms.publication.Session;
//import org.apache.lenya.ac.Identity;
+//TODO : remove this interface from here as there is publication and not repository
public interface Repository {
- Session getSession(HttpServletRequest request);
+ //Session getSession(HttpServletRequest request);
//florent : remove as it create cycliq dependencies.
//note : can be re-enable now as identity is in lenya-core-identity
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java Mon Sep 26 09:06:23 2011
@@ -17,6 +17,7 @@
*/
package org.apache.lenya.cms.publication;
+//@deprecated use lenya-core-api o.a.l.exceptions.ResourceNotFoundException
public class ResourceNotFoundException extends RuntimeException {
private static final long serialVersionUID = 1L;
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteManager.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteManager.java Mon Sep 26 09:06:23 2011
@@ -21,7 +21,7 @@ package org.apache.lenya.cms.site;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.Session;
+//import org.apache.lenya.cms.publication.Session;
/**
* <p>
@@ -40,7 +40,6 @@ import org.apache.lenya.cms.publication.
* <strong>< </strong>f</li>
* </ul>
*
- * @version $Id$
*/
public interface SiteManager {
@@ -66,7 +65,8 @@ public interface SiteManager {
* @return An array of resources.
* @throws SiteException if an error occurs.
*/
- DocumentLocator[] getRequiredResources(Session session, DocumentLocator locator)
+ //florent DocumentLocator[] getRequiredResources(Session session, DocumentLocator locator)
+ DocumentLocator[] getRequiredResources(DocumentLocator locator)
throws SiteException;
/**
@@ -176,7 +176,8 @@ public interface SiteManager {
* @return A locator.
* @throws SiteException if the new document could not be built.
*/
- DocumentLocator getAvailableLocator(Session session, DocumentLocator locator)
+ //florent : DocumentLocator getAvailableLocator(Session session, DocumentLocator locator)
+ DocumentLocator getAvailableLocator(DocumentLocator locator)
throws SiteException;
}
Modified: lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java Mon Sep 26 09:06:23 2011
@@ -39,15 +39,16 @@ public class AreaImpl implements Area {
private String name;
private Publication pub;
private NodeFactory nodeFactory;
- private Session session;
+ //florent : private Session session;
/**
* @param session The factory.
* @param pub The publication.
* @param name The area name.
*/
- public AreaImpl(Session session, NodeFactory nodeFactory, Publication pub, String name) {
- this.session = session;
+ /* florent public AreaImpl(Session session, NodeFactory nodeFactory, Publication pub, String name) {
+ this.session = session;*/
+ public AreaImpl(NodeFactory nodeFactory, Publication pub, String name) {
this.pub = pub;
this.name = name;
this.nodeFactory = nodeFactory;
Modified: lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java Mon Sep 26 09:06:23 2011
@@ -37,7 +37,9 @@ public class PublicationImpl extends Abs
private PublicationConfiguration delegate;
private NodeFactory nodeFactory;
- private Session session;
+ //private Session session;
+ //florent : TODO : bean wiring for pubmanager
+ private PublicationManager pubmanager;
protected PublicationImpl(Session session, NodeFactory nodeFactory,
PublicationConfiguration delegate) {
@@ -153,7 +155,8 @@ public class PublicationImpl extends Abs
String schema = this.delegate.getWorkflowSchema(resourceType);
if (schema == null && getTemplateId() != null) {
String templateId = getTemplateId();
- Publication template = getSession().getPublication(templateId);
+ //Publication template = getSession().getPublication(templateId);
+ Publication template = pubmanager.getPublication(templateId);
schema = template.getWorkflowSchema(resourceType);
}
return schema;
Modified: lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java Mon Sep 26 09:06:23 2011
@@ -87,6 +87,12 @@ public final class PublicationManagerImp
return this.id2config;
}
+ //florent : to get publication from spring
+ public Publication getPublication(String pubID){
+ return (Publication)WebAppContextUtils.getCurrentWebApplicationContext().getBean(Publication.class.getName()+"/"+pubID);
+ }
+
+
public Publication getPublication(DocumentFactory factory, String id)
throws PublicationException {
Validate.notNull(id);
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java Mon Sep 26 09:06:23 2011
@@ -23,7 +23,6 @@ import java.util.Collection;
/**
* A repository node is used to persist a {@link Persistable}.
*
- * @version $Id$
*/
public interface Node extends RepositoryItem, ContentHolder {
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java Mon Sep 26 09:06:23 2011
@@ -22,7 +22,9 @@ package org.apache.lenya.cms.repository;
/**
* Store for read-only items which are shared by all sessions for performance reasons.
*/
-public interface SharedItemStore extends Session {
+//florent : public interface SharedItemStore extends Session {
+public interface SharedItemStore {
+
/**
* The service role.
Modified: lenya/trunk/org.apache.lenya.core.repository.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.impl/pom.xml?rev=1175728&r1=1175727&r2=1175728&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.repository.impl/pom.xml Mon Sep 26 09:06:23 2011
@@ -13,64 +13,76 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-repository-impl</artifactId>
<packaging>jar</packaging>
- <name>Apache Lenya Core Repository implementation</name>
+ <name>Apache Lenya Repository implementation</name>
<dependencies>
<dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-repository-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-publication-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-metadata-api</artifactId>
+ <artifactId>lenya-core-document-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-observation</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-transaction-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-identity</artifactId>
- </dependency>
-
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-publication-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-metadata-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-observation</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-transaction-impl</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-identity</artifactId>-->
+<!-- </dependency>-->
+<!-- -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>commons-logging</groupId>-->
+<!-- <artifactId>commons-logging</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>commons-lang</groupId>-->
+<!-- <artifactId>commons-lang</artifactId>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-util</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-core</artifactId>-->
+<!-- </dependency>-->
<!-- TODO: remove dependencies on Avalon and Excalibur -->
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.avalon.framework</groupId>-->
+<!-- <artifactId>avalon-framework-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
- <version>2.2.3</version>
- </dependency>
+ </dependency>
+<!-- <version>2.2.3</version>-->
+<!-- </dependency>-->
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org