You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ma...@apache.org on 2009/07/29 14:32:04 UTC

svn commit: r798873 - in /incubator/wink/trunk: pom.xml src/doc/readme.txt wink-scripts/wink-dist/build.xml

Author: martins
Date: Wed Jul 29 12:32:04 2009
New Revision: 798873

URL: http://svn.apache.org/viewvc?rev=798873&view=rev
Log:
Modify distribution archive

Modified:
    incubator/wink/trunk/pom.xml
    incubator/wink/trunk/src/doc/readme.txt
    incubator/wink/trunk/wink-scripts/wink-dist/build.xml

Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=798873&r1=798872&r2=798873&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Wed Jul 29 12:32:04 2009
@@ -413,41 +413,6 @@
     </dependencyManagement>
     <reporting>
         <plugins>
-            <!--
-                This plugin creates the changelog report for each
-                module. Should be un comment when the repository is
-                define
-            -->
-            <!--
-                <plugin> <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changelog-plugin</artifactId>
-                <reportSets> <reportSet> <id>changelog-report</id>
-                <reports> <report>changelog</report> </reports>
-                </reportSet> </reportSets> <configuration>
-                <type>range</type> <range>30</range> </configuration>
-                </plugin>
-            -->
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <!-- <report>dependencies</report> -->
-                            <report>dependency-convergence</report>
-                            <report>project-team</report>
-                            <report>license</report>
-                            <!-- report>scm</report-->
-                            <!-- report>mailing-list</report-->
-                            <!-- report>cim</report-->
-                            <!-- report>issue-tracking</report-->
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
@@ -473,56 +438,6 @@
             </plugin>
         </plugins>
     </reporting>
-    <developers>
-        <developer>
-            <id>baram</id>
-            <name>Eli Baram</name>
-            <email>eliezer.baram@hp.com</email>
-            <roles>
-                <role>project manager</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>shadi</id>
-            <name>Tomer Shadi</name>
-            <email>tomer.shadi@hp.com</email>
-            <roles>
-                <role>project architect</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>snitkovsky</id>
-            <name>Martin Snitkovsky</name>
-            <email>martin.snitkovsky@hp.com</email>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>elman</id>
-            <name>Elman Michael</name>
-            <email>elman@hp.com</email>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>fischer</id>
-            <name>Nadav Fischer</name>
-            <email>nadav.fischer@hp.com</email>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>cohen</id>
-            <name>Tali Alsaigh Cohen</name>
-            <email>tali.alsaigh-cohen@hp.com</email>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-    </developers>
     <profiles>
         <!--
             This profile should be activated during CI build.

Modified: incubator/wink/trunk/src/doc/readme.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/src/doc/readme.txt?rev=798873&r1=798872&r2=798873&view=diff
==============================================================================
--- incubator/wink/trunk/src/doc/readme.txt (original)
+++ incubator/wink/trunk/src/doc/readme.txt Wed Jul 29 12:32:04 2009
@@ -1,106 +1,52 @@
-
 Apache Wink Distribution
 ===============================================================================
 
-SDK version
+Wink version
 ===============================================================================
 @PROJECT_VERSION@
 
-
-Wink distribution file
-===============================================================================
-apache-wink-@PROJECT_VERSION@.zip
-
-
-Java version
-===============================================================================
-- Java 1.5 
-
-
-
-List of files and directories in SDK distribution home
+Wink distribution content
 ===============================================================================
 dist
-  - contains SDK jar files; wink-@PROJECT_VERSION@.jar is full version for Java 1.5,
-    SDK components are separately available in subdirectory components 
+  - contains all Wink binaries. 
+  - wink-@PROJECT_VERSION@.jar is all-in-one archive
 docs
-  - directory containing the SDK documentation
+  - contains Wink documentation (API, User Guide)
 examples
-  - directory containing SDK example projects
+  - contains Wink examples
 lib
-  - directory containing SDK dependencies
+  - contains Wink dependencies
 lib\apis
-  - directory containing SDK compilation dependencies only
-LICENSE.txt
-  - SDK license file
-NOTICE.txt
-  - NOTICE file corresponding to third party licenses requirements
-readme.txt
-  - this file
-
-
-SDK installation
-===============================================================================
-Install SDK by unzipping the distribution file. As a result the directory 
-apache-wink-@PROJECT_VERSION@ is created. This directory is referred to as SDK_HOME.
-
+  - contains Wink compile-time dependencies
+lib\examples
+  - contains Wink client examples dependencies
 
-SDK documentation
+Wink installation
 ===============================================================================
-$SDK_HOME/docs
-  - Developer Guide (pdf)
-$SDK_HOME/docs/api
-  - SDK javadocs
-
+Install Wink by unzipping the distribution archive. As a result the directory 
+apache-wink-@PROJECT_VERSION@ is created. This directory is referred to as WINK_HOME.
 
-SDK examples
+Wink examples
 ===============================================================================
-Directory $SDK_HOME/examples contains several examples of SDK usage. The 
-examples contain source codes, project files, and other resources. Example 
-projects are preconfigured to use libraries and the javadoc available in this 
+Directory $WINK_HOME/examples contains Wink examples. The examples contain source codes, 
+project files, and other resources. Example projects are pre-configured to use libraries and the javadoc available in this 
 distribution.
-
 A description of an example is available in the example directory.
 
-
-SDK source files
+Wink sources 
 ===============================================================================
-SDK distribution contains sources in dist directory in jar files "*-sources.jar".
-Sources of SDK components are separately available in subdirectory components. 
-
-
-List of libraries SDK is dependent on
-===============================================================================
-geronimo-j2ee_1.4_spec-1.1.jar (only for compilation)
-activation-1.1.jar
-commons-lang-2.3.jar
-jaxb-api-2.1-sources.jar
-jaxb-api-2.1.jar
-jaxb-impl-2.1.4-sources.jar
-jaxb-impl-2.1.4.jar
-jcl-over-slf4j-1.5.6.jar
-json-20080701.jar
-jsr311-api-1.0.jar
-slf4j-api-1.5.8.jar
-slf4j-simple-1.5.8.jar
-spring-2.5.jar
-stax-api-1.0-2.jar
-xercesImpl-2.6.2.jar
-commons-cli-1.2.jar (only for running client examples)
-
+Wink distribution contains sources under dist directory in jar files "*-sources.jar".
 
 Maven
 ===============================================================================
-Apache wink is built using using Maven 2, version 2.0.9
-
+Apache Wink is built using using Maven 2, version 2.0.9
 
 Product site
 ===============================================================================
 http://incubator.apache.org/wink
 
-
-Known issues
+Issues 
 ===============================================================================
-See Jira https://issues.apache.org/jira/browse/WINK
+Jira https://issues.apache.org/jira/browse/WINK
 
 --- readme.txt EOF ---

Modified: incubator/wink/trunk/wink-scripts/wink-dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/build.xml?rev=798873&r1=798872&r2=798873&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/build.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/build.xml Wed Jul 29 12:32:04 2009
@@ -29,7 +29,6 @@
 		a. merge.sources - if component should be added to the javadoc.
 			Notice that only packages that start with org.* are added to the javadoc.
 		b. create.dist.components - if the component's target includes jars that should be included in dist/components and in main jars.
-		c. create.dist.resources - if the component has resources (e.g. *.xsd)
 	3. When new component is added under the root level components (e.g. under server in addition to server-core),
 	   the following targets are effected:
 	   	a.  create.dist.lib - if component has dependencies
@@ -43,8 +42,7 @@
 	<property name="dist.docs" value="${dist.root}/docs" />
 	<property name="dist.docs.api" value="${dist.docs}/api" />
 	<property name="dist.dist" value="${dist.root}/dist" />
-	<property name="dist.components" value="${dist.dist}/components" />
-	<property name="dist.resources" value="${dist.dist}/resources" />
+	<property name="dist.components" value="${dist.dist}" />
 	<property name="dist.examples" value="${dist.root}/examples" />
 	<property name="dist.lib" value="${dist.root}/lib" />
 
@@ -62,7 +60,7 @@
 	<property name="tmp.src" value="${tmp}/src" />
 	<property name="tmp.binary" value="${tmp}/binary" />
 
-	<property name="wink.main.jar.name" value="wink-sdk-${project.version}.jar" />
+	<property name="wink.main.jar.name" value="wink-${project.version}.jar" />
 	<property name="project.developerGuide.file" value="${basedir}/../../src/doc/DeveloperGuide/Apache_Wink_User_Guide.pdf" />
 
 	<!-- Init -->
@@ -74,27 +72,6 @@
 		<delete dir="target" />
 	</target>
 
-
-	<!-- Merges sources of all components to a single folder. -->
-	<!-- Used to create a javadoc -->
-	<!--target name="merge.sources" depends="init">
-
-
-		<mkdir dir="${tmp.src}" />
-
-		<!- - Sets file separator for the RE - ->
-		<condition property="re.file.sep" value="\\" else="/">
-			<equals arg1="${file.separator}" arg2="\" />
-		</condition>
-
-		<copy todir="${tmp.src}">
-			<fileset dir="${project.common}" includes="**/src/main/java/org/**" />
-			<fileset dir="${project.server}" includes="**/src/main/java/org/**" />
-			<fileset dir="${project.client}" includes="**/src/main/java/org/**" />
-			<mapper type="regexp" from="^(.*)src${re.file.sep}main${re.file.sep}java${re.file.sep}org(.*)$" to="org/\2" />
-		</copy>
-	</target -->
-
 	<!-- Creates javadoc folder with javadocs for all sources in org.hp package -->
 	<!-- Javadoc is common for all components -->
 	<target name="create.javadoc" depends="init">
@@ -118,45 +95,27 @@
 		<copy todir="${dist.components}" flatten="true" includeemptydirs="false">
 			<fileset dir="${project.common}">
 				<include name="**/*.jar" />
-				<exclude name="**/*xmlbeans-generated*" />
 			</fileset>
 			<fileset dir="${project.server}">
 				<include name="**/*.jar" />
-				<exclude name="**/*xmlbeans-generated*" />
 				<exclude name="**/*test-support*" />
 			</fileset>
 			<fileset dir="${project.client}">
 				<include name="**/*.jar" />
-				<exclude name="**/*xmlbeans-generated*" />
 			</fileset>
 			<fileset dir="${project.apache.httpclient}">
 				<include name="**/*.jar" />
 			</fileset>
 			<fileset dir="${project.webdav}">
 				<include name="**/*.jar" />
-				<exclude name="**/*xmlbeans-generated*" />
 			</fileset>
 			<fileset dir="${project.spring}">
 				<include name="**/*.jar" />
-				<exclude name="**/*xmlbeans-generated*" />
 			</fileset>
 		</copy>
 
 	</target>
 
-	<!--
-	<!- - Creates resources folder with xsds. - ->
-	<target name="create.dist.resources" depends="init">
-		<echo>Making resources</echo>
-		<mkdir dir="${dist.resources}" />
-		<copy todir="${dist.resources}" flatten="true" includeemptydirs="false">
-			<fileset dir="${project.client}" includes="**/src/main/xsd/**" />
-			<fileset dir="${project.common}" includes="**/src/main/xsd/**" />
-			<fileset dir="${project.server}" includes="**/src/main/xsd/**" />
-		</copy>
-	</target>
-	-->
-
 	<!-- Creates lib folder with the third party jars -->
 	<target name="create.dist.lib" depends="init">
 		<echo>Making lib directory</echo>
@@ -238,7 +197,7 @@
 
 	<!-- Creates jar that aggregates all components -->
 	<target name="create.dist.main.jar" depends="create.dist.components">
-		<echo>Making main jar</echo>
+		<echo>Making all in one jar</echo>
 		<ant target="create.dist.aggregator.jar">
 			<property name="tmp.unzip" value="${tmp.binary}" />
 			<property name="aggregator.target" value="${dist.components}" />
@@ -250,12 +209,12 @@
 
 	<!-- Creates jar that aggregates sources of all components -->
 	<target name="create.dist.main.sources.jar" depends="create.dist.components">
-		<echo>Making main sources jar</echo>
+		<echo>Making all in one sources jar</echo>
 		<ant target="create.dist.aggregator.jar">
 			<property name="tmp.unzip" value="${tmp.binary}" />
 			<property name="aggregator.target" value="${dist.components}" />
 			<property name="aggregator.includes" value="*-${project.version}-sources.jar" />
-			<property name="aggregator.jar.name" value="${dist.dist}/wink-sdk-${project.version}-sources.jar" />
+			<property name="aggregator.jar.name" value="${dist.dist}/wink-${project.version}-sources.jar" />
 		</ant>
 	</target>
 
@@ -305,9 +264,8 @@
 		</copy>
 	</target>
 
-	<!-- Creates final zip -->
+	<!-- Done building distribution -->
 	<target name="dist" depends="create.javadoc, create.dist.components, create.dist.lib, create.dist.root.docs, create.dist.main.jar, create.dist.main.sources.jar, create.examples">
-		<!--zip destfile="${target.zip}" basedir="${dist}" /-->
 	</target>
 
 </project>