You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2004/12/21 00:18:46 UTC
svn commit: r122900 - /incubator/apollo/trunk/README.html /incubator/apollo/trunk/maven.xml /incubator/apollo/trunk/project.properties /incubator/apollo/trunk/project.xml
Author: ips
Date: Mon Dec 20 15:18:46 2004
New Revision: 122900
URL: http://svn.apache.org/viewcvs?view=rev&rev=122900
Log:
fixed dist
Added:
incubator/apollo/trunk/README.html
Modified:
incubator/apollo/trunk/maven.xml
incubator/apollo/trunk/project.properties
incubator/apollo/trunk/project.xml
Added: incubator/apollo/trunk/README.html
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/README.html?view=auto&rev=122900
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/README.html Mon Dec 20 15:18:46 2004
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+<title>Apollo README</title>
+<meta http-equiv="refresh" content="0;url=file:docs/index.html">
+</head>
+<body>
+<h1>Incubator Disclaimer</h1>
+<p>
+ The Apollo project is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by Davanum Srinivas. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+</p>
+</body>
+</html>
Modified: incubator/apollo/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/maven.xml?view=diff&rev=122900&p1=incubator/apollo/trunk/maven.xml&r1=122899&p2=incubator/apollo/trunk/maven.xml&r2=122900
==============================================================================
--- incubator/apollo/trunk/maven.xml (original)
+++ incubator/apollo/trunk/maven.xml Mon Dec 20 15:18:46 2004
@@ -133,6 +133,11 @@
<copy todir="${spec.wsdl.dest.dir}">
<fileset dir="${spec.wsdl.src.dir}" />
</copy>
+
+ <attainGoal name="dep-license-files" />
+
+ <!-- Delete empty WEB-INF/tld/ dir that war plugin created -->
+ <delete dir="${maven.war.webapp.dir}/WEB-INF/tld" />
</postGoal>
@@ -146,29 +151,25 @@
in the dist dir. -->
<delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
- <attainGoal name="website" />
- <mkdir dir="${maven.dist.bin.assembly.dir}/docs" />
- <copy todir="${maven.dist.bin.assembly.dir}/docs">
- <fileset dir="${site.dest.dir}" />
- </copy>
-
- <mkdir dir="${maven.dist.bin.assembly.dir}/examples" />
- <copy todir="${maven.dist.bin.assembly.dir}/examples">
- <fileset dir="${basedir}/examples" />
- </copy>
- <delete dir="${maven.dist.bin.assembly.dir}/examples/filesystem/generated" />
-
- <mkdir dir="${maven.dist.bin.assembly.dir}/usr" />
-
<attainGoal name="war:webapp" />
- <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/wsrf" />
- <copy todir="${maven.dist.bin.assembly.dir}/webapps/wsrf">
+ <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/${webapp.name}" />
+ <copy todir="${maven.dist.bin.assembly.dir}/webapps/${webapp.name}">
<fileset dir="${maven.war.webapp.dir}" />
+ </copy>
+
+ <attainGoal name="website" />
+ <property name="docs.assembly.dir" location="${maven.dist.bin.assembly.dir}/docs" />
+ <delete dir="${docs.assembly.dir}" />
+ <mkdir dir="${docs.assembly.dir}" />
+ <copy todir="${docs.assembly.dir}">
+ <fileset dir="${site.dest.dir}" />
</copy>
+
+ <mkdir dir="${maven.dist.bin.assembly.dir}/usr" />
<copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir="${basedir}">
- <include name="README.htm" />
+ <include name="README.html" />
</fileset>
</copy>
@@ -204,6 +205,7 @@
eol="lf"
includes="src/wsdl/**, src/bindings/**" />
</goal>
+
<goal name="pomdep" description="Creates a deps.html file under target. Deps.html contains info on the project dependencies.">
<mkdir dir="${maven.war.build.dir}" />
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
@@ -212,4 +214,25 @@
classpathref="maven.dependency.classpath"
processor="trax"/>
</goal>
+
+ <!-- ================================================================== -->
+ <!-- D E P - L I C E N S E - F I L E S G O A L -->
+ <!-- ================================================================== -->
+ <!-- Creates a *.LICENSE file for each dependency jar based on the -->
+ <!-- "license" property from the dependency definition in the POM -->
+ <!-- ================================================================== -->
+ <goal name="dep-license-files">
+ <property name="licenses.src.dir" location="${maven.src.dir}/licenses" />
+ <property name="licenses.dest.dir" location="${maven.war.webapp.dir}/WEB-INF/lib" />
+ <mkdir dir="${licenses.dest.dir}" />
+ <j:forEach var="dep" items="${pom.dependencies}">
+ <j:if test="${!dep.Type.equals('jar')}">
+ <j:coninue />
+ </j:if>
+ <j:if test="${dep.getProperty('license') != null}">
+ <copy file="${licenses.src.dir}/${dep.getProperty('license')}" tofile="${licenses.dest.dir}/${dep.ArtifactId}-${dep.Version}.LICENSE" />
+ </j:if>
+ </j:forEach>
+ </goal>
+
</project>
Modified: incubator/apollo/trunk/project.properties
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.properties?view=diff&rev=122900&p1=incubator/apollo/trunk/project.properties&r1=122899&p2=incubator/apollo/trunk/project.properties&r2=122900
==============================================================================
--- incubator/apollo/trunk/project.properties (original)
+++ incubator/apollo/trunk/project.properties Mon Dec 20 15:18:46 2004
@@ -24,7 +24,8 @@
##############
# Target dir for our webapp
maven.war.build.dir = ${maven.build.dir}
-maven.war.webapp.dir = ${maven.war.build.dir}/wsrf
+webapp.name = wsrf
+maven.war.webapp.dir = ${maven.war.build.dir}/${webapp.name}
# JALOPY PLUGIN
#################
Modified: incubator/apollo/trunk/project.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.xml?view=diff&rev=122900&p1=incubator/apollo/trunk/project.xml&r1=122899&p2=incubator/apollo/trunk/project.xml&r2=122900
==============================================================================
--- incubator/apollo/trunk/project.xml (original)
+++ incubator/apollo/trunk/project.xml Mon Dec 20 15:18:46 2004
@@ -82,8 +82,9 @@
<version>SNAPSHOT</version>
<url>http://ws.apache.org/ws-fx/addressing/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>ApacheLicense-2.0.txt</license>
<usage>Needed for handling WS-Addressing.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -93,8 +94,9 @@
<version>1.6.2</version>
<url>http://ant.apache.org/</url>
<properties>
- <usage>Needed for various custom Tasks we've defined for updating a Wsdd and running WsdmWsdl2Java.</usage>
+ <license>ApacheLicense-2.0.txt</license>
<scope>compile-time-only</scope>
+ <usage>Needed for various custom Tasks we've defined for updating a Wsdd and running WsdmWsdl2Java.</usage>
</properties>
</dependency>
@@ -104,8 +106,9 @@
<version>SNAPSHOT</version>
<url>http://incubator.apache.org/apollo/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>ApacheLicense-2.0.txt</license>
<usage>Needed for handling requests. This contains the XmlBeans-generated code from the WSRF WSDLs/XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -115,6 +118,7 @@
<version>SNAPSHOT</version>
<url>http://incubator.apache.org/apollo/</url>
<properties>
+ <license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
<usage>Needed for handling our JNDI XML config file via XmlBeans. This "could" be removed, but then we'd probably replace it with commons-config. The reason we avoided that approach is that we leveredge XmlBeans extensively in our codebase.</usage>
</properties>
@@ -126,8 +130,9 @@
<version>1.2-RC2</version>
<url>http://ws.apache.org/axis/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>ApacheLicense-2.0.txt</license>
<usage>Needed for compiling Axis-specific impls in our codebase. It is also needed for unit tests, etc.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -137,8 +142,9 @@
<version>1.2-RC2</version>
<url>http://ws.apache.org/axis/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>BinaryCodeLicense-JaxRpcApi.txt</license>
<usage>Needed for building our JAX-RPC compliant Handler impl.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -148,8 +154,9 @@
<version>1.2-RC2</version>
<url>http://ws.apache.org/axis/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>BinaryCodeLicense-SaajApi.txt</license>
<usage>Needed for building our SOAP-specific code.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -159,8 +166,8 @@
<version>1.0</version>
<url>http://dev2dev.bea.com/technologies/commonj/twm/</url>
<properties>
- <war.bundle>true</war.bundle>
<usage>Needed for timer apis.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -170,6 +177,7 @@
<version>1.0</version>
<url>http://jakarta.apache.org/commons/cli/</url>
<properties>
+ <license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -180,6 +188,7 @@
<version>3.1</version>
<url>http://jakarta.apache.org/commons/collections/</url>
<properties>
+ <license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -190,6 +199,7 @@
<version>1.6</version>
<url>http://jakarta.apache.org/commons/digester/</url>
<properties>
+ <license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -200,6 +210,7 @@
<version>0.2</version>
<url>http://jakarta.apache.org/commons/discovery/</url>
<properties>
+ <license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
<usage>Needed by Axis.</usage>
</properties>
@@ -211,6 +222,7 @@
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
+ <license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
<usage>Needed for utility operations like StringUtils, ExceptionUtils etc.</usage>
</properties>
@@ -222,8 +234,9 @@
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>ApacheLicense-2.0.txt</license>
<usage>Needed for logging purposes.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -233,8 +246,9 @@
<version>1.3.4</version>
<url>http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>DougLeaTechnologyLicense.txt</license>
<usage>Needed for threading.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -244,8 +258,9 @@
<version>1.1-beta-4</version>
<url>http://jaxen.org/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <license>WerkenPublicLicense-1.3.txt</license>
<usage>Needed for handling XPath queries with XmlBeans.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -256,8 +271,9 @@
<url>http://www.junit.org/</url>
<properties>
<classloader>root</classloader>
- <war.bundle>true</war.bundle>
+ <license>CommonPublicLicense-1.0.txt</license>
<usage>Needed for running unit tests.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -267,9 +283,10 @@
<version>2.3</version>
<url>http://java.sun.com/products/servlet/</url>
<properties>
- <war.bundle>false</war.bundle>
- <usage>Needed to compile our servlet.</usage>
+ <license>BinaryCodeLicense-ServletApi.txt</license>
<scope>compile-time-only</scope>
+ <usage>Needed to compile our servlet.</usage>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
@@ -279,9 +296,10 @@
<version>SNAPSHOT</version>
<url>http://incubator.apache.org/directory/subprojects/directory-naming/</url>
<properties>
- <war.bundle>true</war.bundle>
- <usage>Needed for in-memory JNDI provider.</usage>
+ <license>ApacheLicense-2.0.txt</license>
<scope>runtime-only</scope>
+ <usage>Needed for in-memory JNDI provider.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -291,9 +309,10 @@
<version>SNAPSHOT</version>
<url>http://incubator.apache.org/directory/subprojects/directory-naming/</url>
<properties>
- <war.bundle>true</war.bundle>
- <usage>Needed for in-memory JNDI provider.</usage>
+ <license>ApacheLicense-2.0.txt</license>
<scope>runtime-only</scope>
+ <usage>Needed for in-memory JNDI provider.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -315,9 +334,10 @@
<version>2.5.1</version>
<url>http://xml.apache.org/xalan-j/</url>
<properties>
- <war.bundle>true</war.bundle>
- <usage>Needed for XSL and report generation.</usage>
+ <license>ApacheLicense-2.0.txt</license>
<scope>compile-time-only</scope>
+ <usage>Needed for XSL and report generation.</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org