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/12 11:07:43 UTC
svn commit: r1034327 - in /lenya/trunk/org.apache.lenya.core.cocoon: ./
src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/lenya/ src/main/java/org/apache/lenya/cms/
src/main/java/org/apache/lenya/cms/cocoon/ src/main/java/org/apache...
Author: florent
Date: Fri Nov 12 10:07:42 2010
New Revision: 1034327
URL: http://svn.apache.org/viewvc?rev=1034327&view=rev
Log:
- add moved class to core-cocoon
Added:
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/context/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/context/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/flow/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/selection/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/selection/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/serialization/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/serialization/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/
- copied from r1033911, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
- copied unchanged from r1033911, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.java
- copied unchanged from r1033911, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/PublicationSourceFactory.java
- copied unchanged from r1033911, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/source/PublicationSourceFactory.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
- copied unchanged from r1033911, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
- copied unchanged from r1033911, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
Removed:
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java
Modified:
lenya/trunk/org.apache.lenya.core.cocoon/ (props changed)
lenya/trunk/org.apache.lenya.core.cocoon/pom.xml
lenya/trunk/org.apache.lenya.core.cocoon/rcl.properties
lenya/trunk/org.apache.lenya.core.cocoon/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
Propchange: lenya/trunk/org.apache.lenya.core.cocoon/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 12 10:07:42 2010
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml
Modified: lenya/trunk/org.apache.lenya.core.cocoon/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/pom.xml?rev=1034327&r1=1034326&r2=1034327&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/pom.xml Fri Nov 12 10:07:42 2010
@@ -16,7 +16,14 @@
<description>Contains core cocoon components defined for Lenya</description>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
<!-- TODO : see if all theses dependencies are required -->
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: lenya/trunk/org.apache.lenya.core.cocoon/rcl.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/rcl.properties?rev=1034327&r1=1034326&r2=1034327&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/rcl.properties (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/rcl.properties Fri Nov 12 10:07:42 2010
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.apache.lenya.lenya-core-cocoon-components.service%classes-dir=./target/classes
\ No newline at end of file
+org.apache.lenya.core.cocoon.block%classes-dir=./target/classes
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1034327&r1=1034326&r2=1034327&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Fri Nov 12 10:07:42 2010
@@ -25,8 +25,8 @@
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
<!-- exemple from the archetype -->
- <bean name="org.apache.lenya.lenya-core-cocoon-components.service" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/lenya-core-cocoon-components" context-path="blockcontext:/lenya-core-cocoon-components/"/>
+ <bean name="org.apache.lenya.core.cocoon.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/lenya.core.cocoon" context-path="blockcontext:/lenya.core.cocoon/"/>
</bean>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org