You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2006/10/02 14:17:04 UTC
svn commit: r451992 - in /cocoon/trunk: assembly.xml pom.xml
Author: vgritsenko
Date: Mon Oct 2 05:17:03 2006
New Revision: 451992
URL: http://svn.apache.org/viewvc?view=rev&rev=451992
Log:
the right to assemble
Added:
cocoon/trunk/assembly.xml (with props)
Modified:
cocoon/trunk/pom.xml
Added: cocoon/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/assembly.xml?view=auto&rev=451992
==============================================================================
--- cocoon/trunk/assembly.xml (added)
+++ cocoon/trunk/assembly.xml Mon Oct 2 05:17:03 2006
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<assembly>
+ <id>bin</id>
+
+ <formats>
+ <!--
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ -->
+ <format>zip</format>
+ </formats>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.apache.cocoon:cocoon-bootstrap</include>
+ <include>org.apache.cocoon:cocoon-core</include>
+ </includes>
+ <sources>
+ <outputDirectory>sources</outputDirectory>
+ </sources>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <unpack>true</unpack>
+ <outputDirectory>binaries</outputDirectory>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.cocoon:cocoon-webapp</include>
+ </includes>
+ <sources>
+ <outputDirectory>webappsrc</outputDirectory>
+ </sources>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <unpack>true</unpack>
+ <outputDirectory>webappbin</outputDirectory>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>dependencies</outputDirectory>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: cocoon/trunk/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=451992&r1=451991&r2=451992
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Oct 2 05:17:03 2006
@@ -21,7 +21,9 @@
<!--+
| @version $Id$
+-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -34,13 +36,13 @@
<version>2-SNAPSHOT</version>
<name>Apache Cocoon</name>
<url>http://cocoon.apache.org</url>
- <inceptionYear>1999</inceptionYear>
+ <inceptionYear>1999</inceptionYear>
<modules>
<module>blocks</module>
<module>commons</module>
<module>core</module>
<module>tools</module>
- <module>site/cocoon-maven-site-skin</module>
+ <module>site/cocoon-maven-site-skin</module>
</modules>
<repositories>
<repository>
@@ -70,12 +72,14 @@
<id>snapshots</id>
<url>http://snapshots.maven.codehaus.org/maven2</url>
</pluginRepository>
- -->
- </pluginRepositories>
+ -->
+ </pluginRepositories>
+
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
+
<developers>
<developer>
<id>crossley</id>
@@ -232,10 +236,12 @@
<timezone>-5</timezone>
</developer>
</developers>
+
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/COCOON</url>
</issueManagement>
+
<ciManagement>
<system>continuum</system>
<url>http://cocoon.zones.apache.org:12000/continuum/servlet/continuum</url>
@@ -248,6 +254,7 @@
</notifier>
</notifiers>
</ciManagement>
+
<mailingLists>
<mailingList>
<name>Cocoon User List</name>
@@ -297,11 +304,13 @@
</otherArchives>
</mailingList>
</mailingLists>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs/cocoon/trunk</url>
</scm>
+
<distributionManagement>
<repository>
<id>cocoon-staging-repo</id>
@@ -316,8 +325,9 @@
<site>
<id>website</id>
<url>${docs.deploymentBaseUrl}</url>
- </site>
+ </site>
</distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -326,42 +336,42 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
<plugin>
<groupId>org.daisycms</groupId>
<artifactId>daisy-maven-plugin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<configuration>
<repoUrl>http://cocoon.zones.apache.org:9263</repoUrl>
- <editUrl>http://cocoon.zones.apache.org/daisy/cocoon-documentation/</editUrl>
+ <editUrl>http://cocoon.zones.apache.org/daisy/cocoon-documentation/</editUrl>
<daisyServerId>cocoon-daisy</daisyServerId>
<cleanSiteXml>true</cleanSiteXml>
- <author>The Cocoon Community</author>
+ <author>The Cocoon Community</author>
<collections>
<collection>
<name>cdocs-site-main</name>
<path>/</path>
- </collection>
+ </collection>
<collection>
<name>cdocs-site-blocks</name>
<path>blocks/</path>
- </collection>
+ </collection>
<collection>
<name>cdocs-site-core-modules</name>
<path>core-modules/</path>
- </collection>
+ </collection>
<collection>
<name>cdocs-site-maven-plugins</name>
<path>maven-plugins/</path>
- </collection>
+ </collection>
<collection>
<name>cdocs-core</name>
<path>core-modules/core/2.2/</path>
- </collection>
+ </collection>
<collection>
<name>cdocs-forms</name>
<path>blocks/forms/1.0/</path>
@@ -372,20 +382,20 @@
</collection>
</collections>
<siteXmlContent>
- <![CDATA[
+ <![CDATA[
<project>
<skin>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-maven-site-skin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>cocoon-maven-site-skin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</skin>
<body>
<!-- @daisy-start@ --><!-- @daisy-end@ -->
<menu ref="reports"/>
</body>
- </project>
+ </project>
]]>
- </siteXmlContent>
+ </siteXmlContent>
</configuration>
<executions>
<execution>
@@ -394,8 +404,8 @@
<goal>cocoon</goal>
</goals>
</execution>
- </executions>
- </plugin>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<extensions>
@@ -432,8 +442,21 @@
<tagBase>https://svn.apache.org/repos/asf/cocoon/tags</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <descriptor>assembly.xml</descriptor>
+ <!--
+ <finalName>final_name</finalName>
+ -->
+ <outputDirectory>target/release</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
@@ -450,8 +473,9 @@
</plugin>
</plugins>
</reporting>
+
<properties>
<docs.deploymentBaseUrl>file://${basedir}/../../../site/site</docs.deploymentBaseUrl>
<docs.externalUrl>http://cocoon.apache.org</docs.externalUrl>
- </properties>
+ </properties>
</project>