Author: psharples
Date: Tue Oct 25 11:14:59 2011
New Revision: 1188605

URL: http://svn.apache.org/viewvc?rev=1188605&view=rev
Log:
Realigning 0.9.2 files to be in synch with the changes made in the 0.9.1 branch 
for the last build.

Added:
    incubator/wookie/trunk/pom-template.xml   (with props)
Modified:
    incubator/wookie/trunk/ant/ivy-java-common.xml
    incubator/wookie/trunk/ant/ivy-release-common.xml
    incubator/wookie/trunk/build.properties
    incubator/wookie/trunk/build.xml
    incubator/wookie/trunk/connector/java/pom-template.xml
    incubator/wookie/trunk/etc/release/runsignatures.bat
    incubator/wookie/trunk/etc/release/src-build-include.txt
    incubator/wookie/trunk/ivy.xml
    incubator/wookie/trunk/modules/jcr/build.properties
    incubator/wookie/trunk/modules/jcr/ivy.xml
    incubator/wookie/trunk/parser/java/pom-template.xml
    incubator/wookie/trunk/src/widgetserver.properties

Modified: incubator/wookie/trunk/ant/ivy-java-common.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/ivy-java-common.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/ant/ivy-java-common.xml (original)
+++ incubator/wookie/trunk/ant/ivy-java-common.xml Tue Oct 25 11:14:59 2011
@@ -18,7 +18,7 @@
 <project xmlns:ivy="antlib:org.apache.ivy.ant" 
xmlns:m="http://ant.apache.org/ivy/maven"; 
xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
 
     <import file="ivy-common.xml"/>
-       
+
        <property name="project.lib.dir" 
location="${project.webapp.dir}/WEB-INF/lib" />
 
        <property name="project.core.src.dir" location="src" />
@@ -142,8 +142,8 @@
             <syspropertyset refid="run.syspropertyset.id"/>
            </java>             
        </target>       
-    
-    <target name="jar" depends="test-calling-project, clean-dist, 
compile-core" unless="not-subproject" description="--> make a jar file for this 
project">
+
+       <target name="jar-compiled" unless="not-subproject" 
depends="test-calling-project,clean-dist, compile-core">
        <mkdir dir="${dist.dir}"/>
        <!-- Create compiled jar -->
         <jar destfile="${dist.dir}/${ant.project.name}.jar">
@@ -162,26 +162,10 @@
                                <attribute name="Implementation-Version" 
value="${version}"/>
                        </manifest>
         </jar>
-       
-       <!-- Create source JAR -->
-       <jar destfile="${dist.dir}/${ant.project.name}-sources.jar">
-               <fileset dir="${project.core.src.dir}">
-                       <include name="**/*"/>
-               </fileset>
-                       <metainf dir="../../">
-                               <include name="LICENSE"/>
-                               <include name="NOTICE"/>
-                               <include name="DISCLAIMER"/>
-                       </metainf>    
-               <manifest>                              
-                               <attribute name="Built-By" 
value="${user.name}"/>
-                               <attribute name="Implementation-Vendor" 
value="Apache Software Foundation"/>
-                               <attribute name="Implementation-Title" 
value="${ant.project.name}"/>
-                               <attribute name="Implementation-Version" 
value="${version}"/>
-                       </manifest>             
-       </jar>
-
-       <!-- Create javadoc JAR -->     
+       </target>
+       
+       <target name="jar-javadoc" depends="clean-dist, compile-core">
+               <!-- Create javadoc JAR -->     
        <mkdir dir="${dist.dir}/javadoc/"/>
        <javadoc packagenames="*"
                        sourcepath="${project.core.src.dir}"
@@ -197,8 +181,8 @@
        <jar destfile="${dist.dir}/${ant.project.name}-javadoc.jar">
                <fileset dir="${dist.dir}/javadoc"/>
                        <metainf dir="../../">
-                               <include name="LICENSE"/>
-                               <include name="NOTICE"/>
+                       <include name="LICENSE"/>
+                       <include name="NOTICE"/>
                                <include name="DISCLAIMER"/>
                        </metainf>    
                <manifest>                              
@@ -210,20 +194,136 @@
        </jar>
        <!--remove folder-->
        <delete dir="${dist.dir}/javadoc" />
+       </target>
+    
+    <target name="jar-sources" depends="clean-dist, compile-core"  
description="--> make a jar file for this project">
+       <mkdir dir="${dist.dir}"/>
+       <!-- Create source JAR -->
+       <jar destfile="${dist.dir}/${ant.project.name}-sources.jar">
+               <fileset dir="${project.core.src.dir}">
+                       <include name="**/*"/>
+               </fileset>
+                       <metainf dir="../../">
+                               <include name="LICENSE"/>
+                               <include name="NOTICE"/>
+                               <include name="DISCLAIMER"/>
+                       </metainf>    
+               <manifest>                              
+                               <attribute name="Built-By" 
value="${user.name}"/>
+                               <attribute name="Implementation-Vendor" 
value="Apache Software Foundation"/>
+                               <attribute name="Implementation-Title" 
value="${ant.project.name}"/>
+                               <attribute name="Implementation-Version" 
value="${version}"/>
+                       </manifest>             
+       </jar>
     </target>
        
+       <!-- TODO - figure how to call NOT from init-war, rather then have 2 
similar methods -->
     <target name="test-calling-project">
        <condition property="not-subproject">
                <equals arg1="${ant.project.name}" arg2="wookie"/>
        </condition>
-    </target>  
+    </target>
 
+       <target name="test-calling-project-true">
+               <condition property="subproject">
+                       <not>
+                               <equals arg1="${ant.project.name}" 
arg2="wookie"/>
+                       </not>
+               </condition>
+       </target>
+       
+       <target name="init-war" unless="subproject" 
depends="test-calling-project-true" >               
+               <ivy:cachepath pathid="project.core.class.path" conf="dev" />
+               <copy 
todir="${servletEngine.webapp.dir}/${ant.project.name}/WEB-INF/classes">
+                       <fileset dir="${project.build.classes.dir}" />
+               </copy>
+
+               <copy todir="${servletEngine.webapp.dir}/${ant.project.name}">
+                       <fileset dir="${project.webapp.dir}" />
+               </copy>
+               <ivy:retrieve conf="deploy" 
pattern="${servletEngine.webapp.dir}/${ant.project.name}/WEB-INF/lib/[artifact]-[revision].[ext]"/>
         
+               <antcall target="post-deploy-webapp" inheritRefs="true"/>       
        
+               <echo>Building war</echo>
+
+               <!-- back the widgetserver.properties file up -->
+               <copy 
file="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
+                        tofile="${build.dir}/widgetserver.properties" 
overwrite="true"/>
+
+               <!-- update widgetserver.properties file so that it points to 
mysql as db type-->
+               <copy file="${project.core.src.dir}/widgetserver.properties"
+                        todir="${build.dir}/webapp/wookie/WEB-INF/classes/" 
overwrite="true">
+                       <filterset>
+                           <filter token="PERSISTENCE_MANAGER_CLASSNAME" 
value="org.apache.wookie.beans.jpa.JPAPersistenceManager"/>
+                       <filter token="DATABASE_TYPE" value="mysql"/>
+                       <filter token="REPOSITORY_USER" value=""/>
+                       <filter token="REPOSITORY_PASSWORD" value=""/>
+                               <filter token="REPOSITORY_ROOTPATH" value=""/>
+                               <filter token="REPOSITORY_WORKSPACE" value=""/>
+                   </filterset>
+               </copy>
+
+               <!-- build war file -->
+               <war
+                       destfile="${dist.dir}/wookie.war"
+                       webxml="${build.dir}/webapp/wookie/WEB-INF/web.xml">
+                       <lib dir="${build.dir}/webapp/wookie/WEB-INF/lib">
+                               <exclude name="derby-10.2.1.6.jar"/>
+                       </lib>
+                       <classes 
dir="${build.dir}/webapp/wookie/WEB-INF/classes" />
+                       <fileset dir="${build.dir}/webapp/wookie/">
+                               <exclude name="WEB-INF/classes/" />
+                               <exclude name="WEB-INF/lib/" />
+                       </fileset>
+                       <metainf dir=".">
+                               <include name="NOTICE"/>
+                               <include name="DISCLAIMER"/>
+                               <include name="UPGRADING"/>
+                       </metainf>
+                       <metainf dir="etc/release/war/">
+                               <include name="LICENSE"/>
+                       </metainf>
+               </war>
+
+               <!-- put original widgetserver.properties file back -->
+               <copy file="${build.dir}/widgetserver.properties"
+                       
tofile="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
+                       overwrite="true" />
+               <delete file="${build.dir}/widgetserver.properties" />
+
+       </target>       
+
+       <!-- make sure the credentials have been passed via command line -->
        <target name="test-upload-credentials">
                <fail unless="upload.user" message="supply upload.user on the 
command line"/>
                <fail unless="upload.password" message="supply upload.password 
on the command line"/>
        </target>
+       
+       <!-- 
+       Checks to see if the ivysettings is available and sets a property if so.
+       This is because when you run build.xml -> local-publish-subprojects
+       the current path is set to one of the subprojects i.e. connector/java
+       But if you run build.xml -> ivy-java-common.xml -> publish-local
+       then the root "wookie" project is set to the top level. The 
+       following 4 targets figure out where the properties files are relative
+       to whre the current directory is.  It is used eventually in the
+       'sign-artifacts' target below.
+       -->
+       <target name="check-first-location-for-settings">
+           <available file="../../ant/ivysettings.xml" 
property="firstivysettings.present"/>
+       </target>
+       <target name="check-second-location-for-settings">
+           <available file="ant/ivysettings.xml" 
property="secondivysettings.present"/>
+       </target>       
+       <target name="checkfirstrootivyrootpath" 
depends="check-first-location-for-settings" if="firstivysettings.present">
+               <property name="calculated-ivy-path" 
value="../../ant/ivysettings.xml"/>
+               <property name="calculated-this-path" 
value="../../ant/ivy-java-common.xml"/>
+       </target>               
+       <target name="checksecondrootivyrootpath" 
depends="check-second-location-for-settings" if="secondivysettings.present">
+               <property name="calculated-ivy-path" 
value="ant/ivysettings.xml"/>
+               <property name="calculated-this-path" 
value="ant/ivy-java-common.xml"/>
+       </target>
                
-    <target name="publish" depends="clean-build, jar" description="--> publish 
this project in the ivy repository">
+    <target name="publish" depends="clean-build, jar-compiled" 
description="--> publish this project in the ivy repository">
         <ivy:publish
           artifactspattern="[artifact].[ext]"
            resolver="shared"
@@ -244,11 +344,10 @@
         -Dpgp.password=yourpgppassword -Dpgp.keyId=yourpgpkeyId
        
================================================================================
        -->
-       <target name="sign-artifacts">                          
+       <target name="sign-artifacts" depends="checkfirstrootivyrootpath, 
checksecondrootivyrootpath">                                  
                <fail unless="pgp.password" message="supply 
-Dpgp.password=yourpassword on the command line"/>
                <fail unless="pgp.keyId" message="supply -Dpgp.keyId=yourkeyid 
on the command line"/>
-               
-               <ivy:settings id="sign.settingsId" 
file="../../ant/ivysettings.xml"/>           
+               <ivy:settings id="sign.settingsId" 
file="${calculated-ivy-path}"/>
                <ivy:cachepath organisation="org.apache.commons" 
settingsRef="sign.settingsId" 
                        transitive="false" log="download-only" 
module="commons-openpgp" revision="1.0-SNAPSHOT" 
                        inline="true" pathid="openpgp.classpath"/>
@@ -270,7 +369,7 @@
                                <path refid="openpgp.classpath"/>
                                <path refid="openpgp.classpath"/>
                        </classpath>
-                       <arg line="-f ../../ant/ivy-java-common.xml"/>
+                       <arg line="-f ${calculated-this-path}"/>
                        <arg line="sign-internal"/>
                        <arg line="-Dpgp.password=${pgp.password}"/>
                        <arg line="-Dpgp.keyId=${pgp.keyId}"/>
@@ -288,13 +387,14 @@
                        asciiarmor="true">
                        <fileset dir="${local.dist.dir}">
                                <include name="**/*.pom"/>
-                               <include name="**/*.jar"/>                      
+                               <include name="**/*.jar"/>
+                               <include name="**/*.war"/>
                        </fileset>
                </openpgp:signer>               
        </target>
        
-    <target name="make-subproject-pom" unless="not-subproject">
-       <echo>Locally publishing ${ant.project.name}-${version}</echo>
+    <target name="make-subproject-pom">
+       <echo>Making POM file: ${ant.project.name}-${version}</echo>
                <delete file="${dist.dir}/ivy.xml"/> <!-- delete last produced 
ivy file to be sure a new one will be generated -->
        <tstamp>
                        <format property="now" pattern="yyyyMMddHHmmss"/>
@@ -320,20 +420,20 @@
         -Dupload.user=myusername -Dupload.password=mypassword
        
================================================================================
        -->
-       <target name="publish-local" depends="test-calling-project, clean-dist, 
jar, make-subproject-pom" unless="not-subproject" description="--> publish this 
project in the local ivy repository">           
+       <target name="publish-local" depends="clean-dist, jar-compiled, 
jar-sources, jar-javadoc, init-war, make-subproject-pom" description="--> 
publishes this project in the local repository (found under user.home/.m2). Run 
this from the root to publish the 'wookie' project, as well as all subprojects. 
To only publish the subprojects see instead 'publish-local'">         
        <ivy:publish resolver="local"
                pubrevision="${version}"
                forcedeliver="true"
                publishivy="false"
                srcivypattern="${dist.dir}/ivy.xml"
                        pubdate="${now}"
-               conf="deploy"
+               conf="deploy, deploy-with-src-and-docs"
                overwrite="true"                                
                
artifactspattern="${dist.dir}/[artifact](-[classifier]).[ext]"/>        
         <echo message="project ${ant.project.name} published locally with 
version ${version}" />
     </target>  
        
-    <target name="publish-maven-snapshot-artifacts" 
depends="test-upload-credentials, clean-dist, jar, make-subproject-pom" 
description="--> publishes this project in the apache snapshot repository. Dont 
run this from the root, see instead 
'publish-subproject-artifacts-to-snapshot-repo'">
+    <target name="publish-maven-snapshot-artifacts" 
depends="test-upload-credentials, clean-dist, jar-compiled, jar-sources, 
jar-javadoc, init-war, make-subproject-pom" description="--> publishes this 
project in the apache snapshot repository. Run this from the root to publish 
the 'wookie' project, as well as all subprojects. To only publish the 
subprojects see instead 'publish-subproject-artifacts-to-snapshot-repo'">
        <ivy:publish resolver="apache-snapshot-artifacts"
                        pubrevision="${version}"
                        forcedeliver="true"
@@ -342,11 +442,11 @@
                        pubdate="${now}"
                conf="deploy, deploy-with-src-and-docs"
                        overwrite="true"
-                       
artifactspattern="${dist.dir}/[artifact](-[classifier]).[ext]"/>                
                                                
+                       
artifactspattern="${dist.dir}/[artifact](-[classifier]).[ext]"/>
        <echo message="project ${ant.project.name} published to nexus snapshot 
repo with version ${version}" />         
     </target>
 
-    <target name="publish-maven-release-artifacts" 
depends="test-upload-credentials, clean-dist, jar, make-subproject-pom, 
sign-artifacts" description="--> publishes this project in the apache staging 
area repository (prior to release). Dont run this from the root, see instead 
'publish-subproject-artifacts-to-release-repo'">
+    <target name="publish-maven-release-artifacts" 
depends="test-upload-credentials, clean-dist, jar-compiled, jar-sources, 
jar-javadoc, init-war, make-subproject-pom, sign-artifacts" description="--> 
publishes this project in the apache staging area repository (prior to 
release). Run this from the root to publish the 'wookie' project, as well as 
all subprojects. To only publish the subprojects see instead 
'publish-subproject-artifacts-to-release-repo'">
        <ivy:publish resolver="apache-release-artifacts"
                        pubrevision="${version}"
                        forcedeliver="true"

Modified: incubator/wookie/trunk/ant/ivy-release-common.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/ivy-release-common.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/ant/ivy-release-common.xml (original)
+++ incubator/wookie/trunk/ant/ivy-release-common.xml Tue Oct 25 11:14:59 2011
@@ -24,17 +24,17 @@
        <import file="ivy-webapp-common.xml" />
 
        <tstamp />
-       <property name="project.general.name" 
value="apache-wookie-${version}-incubating" />
+       <property name="project.general.name" value="apache-wookie-${version}" 
/>
        
        <property name="wookie.source.folder.name" value="wookie-source" />
        <property name="wookie.war.folder.name" value="wookie-war" />
        <property name="wookie.standalone.folder.name" value="Apache-Wookie" />
        <property name="wookie.source.zip.name"
-               value="apache-wookie-${version}-incubating-src" />      
+               value="apache-wookie-${version}-src" /> 
        <property name="wookie.standalone.zip.name"
-               value="apache-wookie-${version}-incubating-standalone" />
+               value="apache-wookie-${version}-standalone" />
        <property name="wookie.war.name"
-               value="apache-wookie-${version}-incubating-war" />
+               value="apache-wookie-${version}-war" />
        
        <property name="rat.install.version" value="0.7" />     
        <property name="rat.home" value="${user.home}/.ant" />
@@ -68,33 +68,33 @@
        
        <target name="build-release-src" depends="init-rat">
                <echo>Building source release</echo>
-               <mkdir dir="${wookie.release.dir}/${version}-incubating/source" 
/>
+               <mkdir dir="${wookie.release.dir}/${version}/source" />
                
                <!-- run RAT report -->
-               <rat:report 
reportFile="${wookie.release.dir}/${version}-incubating/source/rat-report.txt">
+               <rat:report 
reportFile="${wookie.release.dir}/${version}/source/rat-report.txt">
                        <fileset dir=".">
                                <includesFile 
name="./etc/release/src-build-include.txt" />
                     <excludesfile name="./licenses/rat-ignore.txt"/> 
                    </fileset>
                </rat:report>
                
-               <zip 
destfile="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.zip"
+               <zip 
destfile="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.zip"
                       basedir="."
                        includesFile="./etc/release/src-build-include.txt"   
                  />
                
                <!-- tar -->
-               <tar 
destfile="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.tar.gz"
+               <tar 
destfile="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.tar.gz"
                        compression="gzip">
-                       <zipfileset 
src="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.zip"
 />
+                       <zipfileset 
src="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.zip" />
                </tar>
                
        </target>
 
        <target name="build-release-war" depends="init-rat,clean-build, 
compile-core, deploy-webapp, post-deploy-webapp">
                <echo>Building war release</echo>
-               <delete 
dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}"
 />
-               <mkdir 
dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/"
 />
+               <delete 
dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}" />
+               <mkdir 
dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/scripts/"
 />
                
                <!-- back the widgetserver.properties file up -->
                <copy 
file="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
@@ -124,7 +124,7 @@
                
                <!-- build war file -->
                <war
-                       
destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/wookie.war"
+                       
destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/wookie.war"
                        webxml="${build.dir}/webapp/wookie/WEB-INF/web.xml">    
                        <lib dir="${build.dir}/webapp/wookie/WEB-INF/lib">
                                <exclude name="derby-10.2.1.6.jar"/>
@@ -156,26 +156,26 @@
                -->
 
                <!-- copy sql scripts across -->
-               <copy 
todir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/">
+               <copy 
todir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/scripts/">
                        <fileset 
dir="${build.dir}/classes/org/apache/wookie/beans/jpa/">
                                <include name="*.sql" />
                        </fileset>
                </copy>
 
                <!-- copy over project readme files-->
-               <copy file="DISCLAIMER" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/DISCLAIMER"
 overwrite="yes" />
-               <copy file="etc/release/war/LICENSE" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/LICENSE"
 overwrite="yes" />         
-               <copy file="README" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/README"
 overwrite="yes" />
-               <copy file="RELEASE_NOTES" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES"
 overwrite="yes" />
-               <copy file="NEW_AND_NOTEWORTHY" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/NEW_AND_NOTEWORTHY"
 overwrite="yes" />
-               <copy file="UPGRADING" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/UPGRADING"
 overwrite="yes" />
+               <copy file="DISCLAIMER" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/DISCLAIMER"
 overwrite="yes" />
+               <copy file="etc/release/war/LICENSE" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/LICENSE"
 overwrite="yes" />            
+               <copy file="README" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/README"
 overwrite="yes" />
+               <copy file="RELEASE_NOTES" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES"
 overwrite="yes" />
+               <copy file="NEW_AND_NOTEWORTHY" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/NEW_AND_NOTEWORTHY"
 overwrite="yes" />
+               <copy file="UPGRADING" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/UPGRADING"
 overwrite="yes" />
                <!-- copy WAR readme-->
                <copy file="etc/release/war/WAR_BUILD_NOTES"
-                       
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
+                       
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
                        overwrite="yes" />
 
                <!-- update context for mysql -->
-               <copy file="${etc.dir}/tomcat/conf/jpa-context.xml" 
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/${ant.project.name}.xml"
 overwrite="true">
+               <copy file="${etc.dir}/tomcat/conf/jpa-context.xml" 
tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/${ant.project.name}.xml"
 overwrite="true">
                        <filterset>
                                <filter token="DATABASE_USER" value="java" />
                                <filter token="DATABASE_PASSWORD" value="java" 
/>
@@ -185,35 +185,35 @@
                </copy>
 
                <!-- zip -->
-               <zip 
destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.zip"
 
basedir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/"
 update="true" />
+               <zip 
destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.zip" 
basedir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/"
 update="true" />
 
                <!-- tar -->
-               <tar 
destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.tar.gz"
+               <tar 
destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.tar.gz"
                        compression="gzip">
-                       <zipfileset 
src="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.zip"
 />
+                       <zipfileset 
src="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.zip" />
                </tar>
                
                <!-- run RAT report -->
-               <rat:report 
reportFile="${wookie.release.dir}/${version}-incubating/binary/war/rat-report.txt">
-                       <fileset 
dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/">
+               <rat:report 
reportFile="${wookie.release.dir}/${version}/binary/war/rat-report.txt">
+                       <fileset 
dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/">
                     <excludesfile name="./licenses/rat-ignore.txt"/> 
                    </fileset>
                </rat:report>
 
                <!-- clean up -->
-               <delete 
dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}"
 />
+               <delete 
dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}" />
 
        </target>
 
        <target name="build-release-standalone" depends="init-rat, clean-build, 
compile-core, deploy-webapp, post-deploy-webapp">
 
                <echo>Building standalone release</echo>
-               <delete 
dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}"
 />
-               <mkdir 
dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/build/"
 />
-               <mkdir 
dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/"
 />
-               <mkdir 
dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/etc/"
 />
+               <delete 
dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}"
 />
+               <mkdir 
dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/build/"
 />
+               <mkdir 
dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/"
 />
+               <mkdir 
dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/etc/"
 />
 
-               <copy 
todir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/build/">
+               <copy 
todir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/build/">
                        <fileset dir="${build.dir}/">
                                <exclude name="classes/" />
                                <exclude name="widgets/" />
@@ -221,42 +221,42 @@
                        </fileset>
                </copy>
 
-               <copy 
todir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/">
+               <copy 
todir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/">
                        <fileset dir="etc/release/standalone/" />
                </copy>
 
-               <copy file="./etc/jetty-realm.properties" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/etc/jetty-realm.properties"
 />
-               <copy file="DISCLAIMER" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/DISCLAIMER"
 overwrite="yes" />
-               <!--<copy file="KEYS" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/KEYS"
 overwrite="yes" />-->
-               <copy file="README" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/README"
 overwrite="yes" />
-               <copy file="RELEASE_NOTES" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/RELEASE_NOTES"
 overwrite="yes" />
-               <copy file="NEW_AND_NOTEWORTHY" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/NEW_AND_NOTEWORTHY"
 overwrite="yes" />
-               <copy file="UPGRADING" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/UPGRADING"
 overwrite="yes" />
-               <copy file="etc/release/standalone/LICENSE" 
tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/LICENSE"
 overwrite="yes" />          
+               <copy file="./etc/jetty-realm.properties" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/etc/jetty-realm.properties"
 />
+               <copy file="DISCLAIMER" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/DISCLAIMER"
 overwrite="yes" />
+               <!--<copy file="KEYS" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/KEYS"
 overwrite="yes" />-->
+               <copy file="README" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/README"
 overwrite="yes" />
+               <copy file="RELEASE_NOTES" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/RELEASE_NOTES"
 overwrite="yes" />
+               <copy file="NEW_AND_NOTEWORTHY" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/NEW_AND_NOTEWORTHY"
 overwrite="yes" />
+               <copy file="UPGRADING" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/UPGRADING"
 overwrite="yes" />
+               <copy file="etc/release/standalone/LICENSE" 
tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/LICENSE"
 overwrite="yes" />             
 
                <ivy:retrieve conf="runtime"
-                       
pattern="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]"
 />
+                       
pattern="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]"
 />
 
                <!-- duplicate -->
-               <delete 
file="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/servlet-api-2.5.jar"
 />
+               <delete 
file="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/servlet-api-2.5.jar"
 />
                
                <!-- run RAT report -->
-               <rat:report 
reportFile="${wookie.release.dir}/${version}-incubating/binary/standalone/rat-report.txt">
-                       <fileset 
dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}">
+               <rat:report 
reportFile="${wookie.release.dir}/${version}/binary/standalone/rat-report.txt">
+                       <fileset 
dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}">
                            <excludesfile name="./licenses/rat-ignore.txt"/> 
                            </fileset>
                </rat:report>
                
-               <zip 
destfile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.zip"
-                       
basedir="${wookie.release.dir}/${version}-incubating/binary/standalone/" 
includes="${wookie.standalone.folder.name}/"
+               <zip 
destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.zip"
+                       
basedir="${wookie.release.dir}/${version}/binary/standalone/" 
includes="${wookie.standalone.folder.name}/"
                        update="true" />
 
-               <tar 
destfile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.tar.gz"
+               <tar 
destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.tar.gz"
                        compression="gzip">
-                       <zipfileset 
src="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.zip"
 />
+                       <zipfileset 
src="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.zip"
 />
                </tar>
 
-               <delete 
dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}"
 />
+               <delete 
dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}"
 />
        </target>
        
        <target name="add-extra-files" depends="">

Modified: incubator/wookie/trunk/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/build.properties?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/build.properties (original)
+++ incubator/wookie/trunk/build.properties Tue Oct 25 11:14:59 2011
@@ -1,4 +1,4 @@
-version=0.9.2-SNAPSHOT
+version=0.9.2-incubating-SNAPSHOT
 
 # Uncomment to include Extra features
 include.extra.features

Modified: incubator/wookie/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/build.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/build.xml (original)
+++ incubator/wookie/trunk/build.xml Tue Oct 25 11:14:59 2011
@@ -230,7 +230,7 @@
        <ant antfile="${wookie.widgets.dir}/${widget.shortname}/build.xml" 
target="build-widget"/>
   </target>
        
-  <target name="local-publish-subprojects">
+  <target name="local-publish-subprojects" description="Publishes all sub 
projects (i.e. java connector and parser projects) to the local repository 
found under user.home/.m2">
        <!-- localy publish sub-projects -->
        <ant dir="${wookie.connector.dir}/java" target="publish-local" 
inheritAll="false"/>
        <ant dir="${wookie.parser.w3c.dir}/java" target="publish-local" 
inheritAll="false"/>

Modified: incubator/wookie/trunk/connector/java/pom-template.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/connector/java/pom-template.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/connector/java/pom-template.xml (original)
+++ incubator/wookie/trunk/connector/java/pom-template.xml Tue Oct 25 11:14:59 
2011
@@ -22,10 +22,10 @@
   
   <groupId>${ivy.pom.groupId}</groupId>
   <artifactId>${ivy.pom.artifactId}</artifactId>
-  <packaging>${ivy.pom.packaging}</packaging>
+  <packaging>jar</packaging>
   <version>${ivy.pom.version}</version>
-  <name>${ivy.pom.name}</name>
-  <description>${ivy.pom.description}</description>
+  <name>Apache Wookie java connector</name>
+  <description>Apache Wookie remote java connector</description>
   <licenses>
        <license>
       <name>The Apache Software License, Version 2.0</name>

Modified: incubator/wookie/trunk/etc/release/runsignatures.bat
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/runsignatures.bat?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/runsignatures.bat (original)
+++ incubator/wookie/trunk/etc/release/runsignatures.bat Tue Oct 25 11:14:59 
2011
@@ -11,17 +11,17 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF 
 rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
-set WOOKIE-VERSION=0.9.2-SNAPSHOT
-set ROOT-FOLDER=%WOOKIE-VERSION%-incubating
+set WOOKIE-VERSION=0.9.2-incubating-SNAPSHOT
+set ROOT-FOLDER=%WOOKIE-VERSION%
 set SOURCE-FOLDER=source
-set SRC-BUILD-TAR=apache-wookie-%WOOKIE-VERSION%-incubating-src.tar.gz
-set SRC-BUILD-ZIP=apache-wookie-%WOOKIE-VERSION%-incubating-src.zip
+set SRC-BUILD-TAR=apache-wookie-%WOOKIE-VERSION%-src.tar.gz
+set SRC-BUILD-ZIP=apache-wookie-%WOOKIE-VERSION%-src.zip
 set BINARY-FOLDER-STANDALONE=binary/standalone
-set 
BINARY-STANDALONE-TAR=apache-wookie-%WOOKIE-VERSION%-incubating-standalone.tar.gz
-set 
BINARY-STANDALONE-ZIP=apache-wookie-%WOOKIE-VERSION%-incubating-standalone.zip
+set BINARY-STANDALONE-TAR=apache-wookie-%WOOKIE-VERSION%-standalone.tar.gz
+set BINARY-STANDALONE-ZIP=apache-wookie-%WOOKIE-VERSION%-standalone.zip
 set BINARY-FOLDER-WAR=binary/war
-set BINARY-WAR-TAR=apache-wookie-%WOOKIE-VERSION%-incubating-war.tar.gz
-set BINARY-WAR-ZIP=apache-wookie-%WOOKIE-VERSION%-incubating-war.zip
+set BINARY-WAR-TAR=apache-wookie-%WOOKIE-VERSION%-war.tar.gz
+set BINARY-WAR-ZIP=apache-wookie-%WOOKIE-VERSION%-war.zip
 
 cd %ROOT-FOLDER%/%SOURCE-FOLDER%
 gpg2 --armor --output %SRC-BUILD-TAR%.asc --detach-sig %SRC-BUILD-TAR%

Modified: incubator/wookie/trunk/etc/release/src-build-include.txt
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/src-build-include.txt?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/src-build-include.txt (original)
+++ incubator/wookie/trunk/etc/release/src-build-include.txt Tue Oct 25 
11:14:59 2011
@@ -8,6 +8,7 @@ connector/java/build.properties
 connector/java/build.xml
 connector/java/ivy.xml
 connector/java/README.txt
+connector/java/pom-template.xml
 connector/java/version.properties
 connector/php/
 connector/python/
@@ -25,6 +26,7 @@ parser/java/build.properties
 parser/java/build.xml
 parser/java/ivy.xml
 parser/java/README.txt
+parser/java/pom-template.xml
 parser/java/test.wgt
 project_admin/
 schemas/
@@ -48,4 +50,5 @@ NEW_AND_NOTEWORTHY
 UPGRADING
 NOTICE
 README
-RELEASE_NOTES
\ No newline at end of file
+RELEASE_NOTES
+pom-template.xml
\ No newline at end of file

Modified: incubator/wookie/trunk/ivy.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/ivy.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/ivy.xml (original)
+++ incubator/wookie/trunk/ivy.xml Tue Oct 25 11:14:59 2011
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.wookie" module="wookie" 
revision="0.9.2-SNAPSHOT"/>
+    <info organisation="org.apache.wookie" module="wookie" 
revision="0.9.2-incubating-SNAPSHOT"/>
     
     <configurations>
       <conf name="deploy" description="Provide the necessary files and 
libraries to deploy in a production environment"/>
@@ -23,7 +23,20 @@
          <conf name="dev" extends="deploy, runtime" description="Provide the 
necessary files and libraries to run in standalone (development) mode"/>
          <conf name="test" extends="dev" visibility="private" description="for 
our testing frameowrk"/>
          <conf name="ddlutils" visibility="private" description="Provide the 
necessary libraries to invoke DDLUtils schema generation"/>
+         <conf name="deploy-with-src-and-docs" extends="deploy" 
description="Used for publishing maven artifacts to the snapshot repo"/>
+         <conf name="deploy-signed" extends="deploy-with-src-and-docs" 
description="Used for publishing maven artifacts to the staging area repo"/>    
  
        </configurations>
+       
+       <publications xmlns:e="urn:ant.apache.org:ivy-extras">
+         <artifact name="wookie" conf="deploy" type="pom" ext="pom" />
+      <artifact name="wookie" conf="deploy" type="war" />
+      <artifact name="wookie" conf="deploy-with-src-and-docs" type="sources" 
ext="jar" e:classifier="sources"/>
+      <artifact name="wookie" conf="deploy-with-src-and-docs" type="javadoc" 
ext="jar" e:classifier="javadoc"/>
+      <artifact name="wookie" conf="deploy-signed" type="war.asc" 
ext="war.asc" />
+      <artifact name="wookie" conf="deploy-signed" type="pom.asc" 
ext="pom.asc"/>      
+      <artifact name="wookie" conf="deploy-signed" type="sources.asc" 
ext="jar.asc" e:classifier="sources"/>
+         <artifact name="wookie" conf="deploy-signed" type="javadoc.asc" 
ext="jar.asc" e:classifier="javadoc"/>
+       </publications> 
            
     <dependencies>
         <dependency org="org.apache.wookie" name="wookie-java-connector" 
rev="0.9.2-incubating-SNAPSHOT" conf="deploy->default">

Modified: incubator/wookie/trunk/modules/jcr/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/build.properties?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/build.properties (original)
+++ incubator/wookie/trunk/modules/jcr/build.properties Tue Oct 25 11:14:59 2011
@@ -1,4 +1,4 @@
-version=0.9.2-SNAPSHOT
+version=0.9.2-incubating-SNAPSHOT
 
 # build configuration properties
 build.dir=../../build

Modified: incubator/wookie/trunk/modules/jcr/ivy.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/ivy.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/ivy.xml (original)
+++ incubator/wookie/trunk/modules/jcr/ivy.xml Tue Oct 25 11:14:59 2011
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.wookie" module="wookie-jcr" 
revision="0.9.2-SNAPSHOT"/>
+    <info organisation="org.apache.wookie" module="wookie-jcr" 
revision="0.9.2-incubating-SNAPSHOT"/>
     
     <configurations>
       <conf name="deploy" description="Provide the necessary files and 
libraries to deploy in a production environment"/>

Modified: incubator/wookie/trunk/parser/java/pom-template.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/pom-template.xml?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/pom-template.xml (original)
+++ incubator/wookie/trunk/parser/java/pom-template.xml Tue Oct 25 11:14:59 2011
@@ -16,10 +16,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>${ivy.pom.groupId}</groupId> 
   <artifactId>${ivy.pom.artifactId}</artifactId>
-  <packaging>${ivy.pom.packaging}</packaging>
+  <packaging>jar</packaging>
   <version>${ivy.pom.version}</version>
-  <name>${ivy.pom.name}</name>
-  <description>${ivy.pom.description}</description>
+  <name>Apache Wookie parser</name>
+  <description>Apache Wookie W3C widget parser</description>
   <licenses>
        <license>
       <name>The Apache Software License, Version 2.0</name>

Added: incubator/wookie/trunk/pom-template.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/pom-template.xml?rev=1188605&view=auto
==============================================================================
--- incubator/wookie/trunk/pom-template.xml (added)
+++ incubator/wookie/trunk/pom-template.xml Tue Oct 25 11:14:59 2011
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<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>
+  
+  <groupId>${ivy.pom.groupId}</groupId>
+  <artifactId>${ivy.pom.artifactId}</artifactId>
+  <packaging>war</packaging>
+  <version>${ivy.pom.version}</version>
+  <name>Apache Wookie</name>
+  <description>Apache Wookie</description>
+  <licenses>
+       <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>  
+  <url>http://incubator.apache.org/wookie/</url>
+  <inceptionYear>2009</inceptionYear>
+
+  <scm>
+    
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wookie/trunk</connection>
+    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/wookie/trunk/</developerConnection>
+    <url>http://svn.apache.org/viewvc/incubator/wookie/trunk/</url>        
+  </scm>
+  
+  <mailingLists>
+       <mailingList>
+               <name>Wookie Developer List</name>
+               <subscribe>[email protected]</subscribe>
+               
<unsubscribe>[email protected]</unsubscribe>
+               <post>mailto:[email protected]</post>
+               
<archive>http://mail-archives.apache.org/mod_mbox/incubator-wookie-dev/</archive>
+       </mailingList>
+  </mailingLists>
+
+  <issueManagement>
+       <url>https://issues.apache.org/jira/browse/WOOKIE</url>
+  </issueManagement>
+
+  <developers>
+       <developer>
+               <id>ate</id>
+               <name>Ate Douma</name>
+               <email>[email protected]</email>
+               <timezone>+1</timezone>
+               <organization>Hippo</organization>
+               <organizationUrl>http://www.onehippo.com</organizationUrl>
+               <roles>
+                       <role>mentor</role>
+                       <role>IPMC member</role>
+                       <role>PPMC member</role>
+               </roles>
+       </developer>
+       <developer>
+               <id>rgardler</id>
+               <name>Ross Gardler</name>
+               <email>[email protected]</email>
+               <timezone>0</timezone>
+               <organization>Opendirective</organization>
+               <organizationUrl>http://www.opendirective.com</organizationUrl>
+               <roles>
+                       <role>mentor</role>
+                       <role>IPMC member</role>
+                       <role>PPMC member</role>
+               </roles>
+       </developer>    
+       <developer>
+               <id>psharples</id>
+               <name>Paul Sharples</name>
+               <email>[email protected]</email>
+               <timezone>0</timezone>
+               <organization>The University of Bolton</organization>
+               <organizationUrl>http://www.bolton.ac.uk</organizationUrl>
+               <roles>
+                       <role>committer</role>
+                       <role>release manager</role>
+                       <role>PPMC member</role>
+               </roles>
+       </developer>
+       <developer>
+               <id>scottbw</id>
+               <name>Scott Wilson</name>
+               <email>[email protected]</email>
+               <timezone>0</timezone>
+               <organization>The University of Bolton</organization>
+               <organizationUrl>http://www.bolton.ac.uk</organizationUrl>
+               <roles>
+                       <role>committer</role>
+                       <role>PPMC member</role>
+               </roles>
+       </developer>
+  </developers>     
+</project>
\ No newline at end of file

Propchange: incubator/wookie/trunk/pom-template.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/wookie/trunk/src/widgetserver.properties
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/widgetserver.properties?rev=1188605&r1=1188604&r2=1188605&view=diff
==============================================================================
--- incubator/wookie/trunk/src/widgetserver.properties (original)
+++ incubator/wookie/trunk/src/widgetserver.properties Tue Oct 25 11:14:59 2011
@@ -1,4 +1,4 @@
-widget.version=0.9.2-SNAPSHOT
+widget.version=0.9.2-incubating-SNAPSHOT
 widget.build.date=
 [email protected]
 widget.web.page=http://incubator.apache.org/wookie


Reply via email to