[Jpackage-commits] dist/ws-scout0/JPP-5 .cvsignore, 1.2, 1.3 sources, 1.4, 1.5 ws-scout0-build.xml, NONE, 1.1 ws-scout0-maven-build.xml, NONE, 1.1 ws-scout0-modules-scout-build.xml, NONE, 1.1 ws-scout0-modules-scout-maven-build.xml, NONE, 1.1 ws-scout0.spec, 1.4, 1.5

David Walluck david at ryu.zarb.org
Wed Aug 20 21:45:31 CEST 2008


Update of /home/projects/jpackage/cvs/dist/ws-scout0/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv26266

Modified Files:
	.cvsignore sources ws-scout0.spec 
Added Files:
	ws-scout0-build.xml ws-scout0-maven-build.xml 
	ws-scout0-modules-scout-build.xml 
	ws-scout0-modules-scout-maven-build.xml 
Log Message:
- pull build files out of tarball


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-scout0/JPP-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	20 Aug 2008 18:32:33 -0000	1.2
--- .cvsignore	20 Aug 2008 19:45:29 -0000	1.3
***************
*** 1,2 ****
- ws-scout-0.7rc2-build.tar.bz2
  ws-scout-0.7rc2.tar.bz2
--- 1 ----

--- NEW FILE: ws-scout0-modules-scout-maven-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!--                                                                        -->
<!-- Any modifications will be overwritten.                                 -->
<!--                                                                        -->
<!-- Generated by Maven Ant Plugin on 8/18/08 9:42 PM                       -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
<!--                                                                        -->
<!-- ====================================================================== -->

<project name="scout-from-maven" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Build environment properties                                           -->
  <!-- ====================================================================== -->

  <property file="${user.home}/.m2/maven.properties"/>
  <property file="maven-build.properties"/>

  <property name="maven.build.finalName" value="scout-0.7rc2"/>
  <property name="maven.build.dir" value="target"/>
  <property name="maven.build.outputDir" value="${maven.build.dir}/output/classes"/>
  <property name="maven.build.srcDir.0" value="src/java"/>
  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
  <property name="maven.build.testDir.0" value="src/test/java"/>
  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>

  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="maven.settings.offline" value="false"/>
  <property name="maven.settings.interactiveMode" value="true"/>

  <!-- ====================================================================== -->
  <!-- Defining classpaths                                                    -->
  <!-- ====================================================================== -->

  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="geronimo-spec/geronimo-spec-jaxr/1.0-rc4/geronimo-spec-jaxr-1.0-rc4.jar"/>
      <include name="jdom/jdom/1.0/jdom-1.0.jar"/>
      <include name="geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar"/>
      <include name="commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
      <include name="log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
    </fileset>
  </path>
  <path id="build.test.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="geronimo-spec/geronimo-spec-jaxr/1.0-rc4/geronimo-spec-jaxr-1.0-rc4.jar"/>
      <include name="jdom/jdom/1.0/jdom-1.0.jar"/>
      <include name="geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar"/>
      <include name="commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
      <include name="log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
    </fileset>
  </path>

  <!-- ====================================================================== -->
  <!-- Cleaning up target                                                     -->
  <!-- ====================================================================== -->

  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.dir}"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Compilation target                                                     -->
  <!-- ====================================================================== -->

  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.outputDir}"/>
    <javac destdir="${maven.build.outputDir}" 
           nowarn="false" 
           debug="true" 
           optimize="false" 
           deprecation="true" 
           target="1.1" 
           verbose="false" 
           fork="false" 
           source="1.3">
      <src>
        <pathelement location="${maven.build.srcDir.0}"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>

  <!-- ====================================================================== -->
  <!-- Test-compilation target                                                -->
  <!-- ====================================================================== -->

  <target name="compile-tests" 
          depends="compile" 
          description="Compile the test code" 
          unless="maven.test.skip">
    <mkdir dir="${maven.build.testOutputDir}"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Run all tests                                                          -->
  <!-- ====================================================================== -->

  <target name="test" 
          depends="compile-tests, junit-missing" 
          unless="junit.skipped" 
          description="Run the test cases"/>

  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>

  <target name="test-junit-status" 
          depends="test-junit-present">
    <condition property="junit.missing">
      <and>
        <isfalse value="${junit.present}"/>
        <isfalse value="${maven.test.skip}"/>
      </and>
    </condition>
    <condition property="junit.skipped">
      <or>
        <isfalse value="${junit.present}"/>
        <istrue value="${maven.test.skip}"/>
      </or>
    </condition>
  </target>

  <target name="junit-missing" 
          depends="test-junit-status" 
          if="junit.missing">
    <echo>=================================== WARNING ===================================</echo>
    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
    <echo>===============================================================================</echo>
  </target>

  <!-- ====================================================================== -->
  <!-- Javadoc target                                                         -->
  <!-- ====================================================================== -->

  <target name="javadoc" description="Generates the Javadoc of the application">
    <javadoc sourcepath="${maven.build.srcDir.0}" 
             packagenames="*" 
             destdir="${maven.reporting.outputDirectory}/apidocs" 
             access="protected" 
             old="false" 
             verbose="false" 
             version="true" 
             use="true" 
             author="true" 
             splitindex="false" 
             nodeprecated="false" 
             nodeprecatedlist="false" 
             notree="false" 
             noindex="false" 
             nohelp="false" 
             nonavbar="false" 
             serialwarn="false" 
             charset="ISO-8859-1" 
             linksource="false" 
             breakiterator="false"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Package target                                                         -->
  <!-- ====================================================================== -->

  <target name="package" depends="compile,test" description="Package the application">
    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
         compress="true" 
         index="false" 
         basedir="${maven.build.outputDir}" 
         excludes="**/package.html"/>
  </target>

  <!-- ====================================================================== -->
  <!-- A dummy target for the package named after the type it creates         -->
  <!-- ====================================================================== -->

  <target name="jar" depends="package" description="Builds the jar for the application"/>

  <!-- ====================================================================== -->
  <!-- Download dependencies target                                           -->
  <!-- ====================================================================== -->

  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${maven.settings.offline}" arg2="true"/>
    </condition>
  </target>

  <target name="get-deps" 
          depends="test-offline" 
          description="Download all dependencies" 
          unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="${maven.repo.local}/geronimo-spec/geronimo-spec-jaxr/1.0-rc4"/>
    <get src="file:///usr/share/maven2/repository/geronimo-spec/geronimo-spec-jaxr/1.0-rc4/geronimo-spec-jaxr-1.0-rc4.jar" 
         dest="${maven.repo.local}/geronimo-spec/geronimo-spec-jaxr/1.0-rc4/geronimo-spec-jaxr-1.0-rc4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxr/1.0-rc4/geronimo-spec-jaxr-1.0-rc4.jar" 
         dest="${maven.repo.local}/geronimo-spec/geronimo-spec-jaxr/1.0-rc4/geronimo-spec-jaxr-1.0-rc4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/jdom/jdom/1.0"/>
    <get src="file:///usr/share/maven2/repository/jdom/jdom/1.0/jdom-1.0.jar" 
         dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/jdom/jdom/1.0/jdom-1.0.jar" 
         dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/geronimo-spec/geronimo-spec-activation/1.0.2-rc4"/>
    <get src="file:///usr/share/maven2/repository/geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar" 
         dest="${maven.repo.local}/geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar" 
         dest="${maven.repo.local}/geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/commons-logging/commons-logging/1.0.4"/>
    <get src="file:///usr/share/maven2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" 
         dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" 
         dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.13"/>
    <get src="file:///usr/share/maven2/repository/log4j/log4j/1.2.13/log4j-1.2.13.jar" 
         dest="${maven.repo.local}/log4j/log4j/1.2.13/log4j-1.2.13.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/log4j/log4j/1.2.13/log4j-1.2.13.jar" 
         dest="${maven.repo.local}/log4j/log4j/1.2.13/log4j-1.2.13.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
  </target>

</project>

--- NEW FILE: ws-scout0-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<project name="scout" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Import maven-build.xml into the current project                        -->
  <!-- ====================================================================== -->

  <import file="maven-build.xml"/>
  
  <!-- ====================================================================== -->
  <!-- Help target                                                            -->
  <!-- ====================================================================== -->

  <target name="help">
    <echo message="Please run: $ant -projecthelp"/>
  </target>

</project>

--- NEW FILE: ws-scout0-maven-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!--                                                                        -->
<!-- Any modifications will be overwritten.                                 -->
<!--                                                                        -->
<!-- Generated by Maven Ant Plugin on 8/18/08 9:42 PM                       -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
<!--                                                                        -->
<!-- ====================================================================== -->

<project name="scout-from-maven" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Cleaning up target                                                     -->
  <!-- ====================================================================== -->

  <target name="clean" description="Clean the output directory">
    <ant antfile="build.xml" dir="modules/scout" target="clean"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Compilation target                                                     -->
  <!-- ====================================================================== -->

  <target name="compile" description="Compile the code">
    <ant antfile="build.xml" dir="modules/scout" target="compile"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Test-compilation target                                                -->
  <!-- ====================================================================== -->

  <target name="compile-tests" description="Compile the test code">
    <ant antfile="build.xml" dir="modules/scout" target="compile-tests"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Run all tests                                                          -->
  <!-- ====================================================================== -->

  <target name="test" description="Run the test cases">
    <ant antfile="build.xml" dir="modules/scout" target="test"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Javadoc target                                                         -->
  <!-- ====================================================================== -->

  <target name="javadoc" description="Generates the Javadoc of the application">
    <ant antfile="build.xml" dir="modules/scout" target="javadoc"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Package target                                                         -->
  <!-- ====================================================================== -->

  <target name="package" description="Package the application">
    <ant antfile="build.xml" dir="modules/scout" target="package"/>
  </target>

</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-scout0/JPP-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** sources	20 Aug 2008 19:31:15 -0000	1.4
--- sources	20 Aug 2008 19:45:29 -0000	1.5
***************
*** 1,2 ****
- d937b9cbabaa506b2ce2e96cca39cb08  ws-scout-0.7rc2-build.tar.bz2
  91f68e8c3dfb48dd7e061291f7bdf345  ws-scout-0.7rc2.tar.bz2
--- 1 ----

Index: ws-scout0.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ws-scout0/JPP-5/ws-scout0.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** ws-scout0.spec	20 Aug 2008 19:14:47 -0000	1.4
--- ws-scout0.spec	20 Aug 2008 19:45:29 -0000	1.5
***************
*** 58,67 ****
  Summary:        Apache Scout Implementation of JSR 93 (JAXR)
  License:        ASL 2.0
- Url:            http://ws.apache.org/scout/
  Group:          Text Processing/Markup/XML
  # svn export https://svn.apache.org/repos/asf/webservices/scout/tags/v0.7rc2/ ws-scout-0.7rc2 
  # tar cjf ws-scout-0.7rc2.tar.bz2 ws-scout-0.7rc2
  Source0:        ws-scout-%{real_version}.tar.bz2
- Source1:        pom-maven2jpp-depcat.xsl
  Source2:        pom-maven2jpp-newdepmap.xsl
  Source3:        pom-maven2jpp-mapdeps.xsl
--- 58,66 ----
  Summary:        Apache Scout Implementation of JSR 93 (JAXR)
  License:        ASL 2.0
  Group:          Text Processing/Markup/XML
+ URL:            http://ws.apache.org/scout/
  # svn export https://svn.apache.org/repos/asf/webservices/scout/tags/v0.7rc2/ ws-scout-0.7rc2 
  # tar cjf ws-scout-0.7rc2.tar.bz2 ws-scout-0.7rc2
  Source0:        ws-scout-%{real_version}.tar.bz2
  Source2:        pom-maven2jpp-newdepmap.xsl
  Source3:        pom-maven2jpp-mapdeps.xsl
***************
*** 69,72 ****
--- 68,75 ----
  Source5:        ws-scout-%{real_version}-build.tar.bz2
  Source6:        ws-scout-component-info.xml
+ Source8:        ws-scout0-build.xml
+ Source9:        ws-scout0-maven-build.xml
+ Source10:       ws-scout0-modules-scout-build.xml
+ Source11:       ws-scout0-modules-scout-maven-build.xml
  Patch0:         ws-scout-1.0-jaxr-api-project_xml.patch
  BuildRequires:  jpackage-utils >= 0:1.6
***************
*** 124,135 ****
  %prep
  %setup -q -n ws-scout-%{real_version}
! %setup -q -T -D -a 5 -n ws-scout-%{real_version}
  # Already clean
  #find . -name "*.jar" | xargs -t rm
  # These tests need a running juddi server instance
  rm modules/scout/src/test/org/apache/ws/scout/registry/publish/PublishConceptTest.java
  rm modules/scout/src/test/org/apache/ws/scout/registry/query/JAXRQueryTest.java
  # for checkstyle
! cp LICENSE.TXT modules/jaxr-api/LICENSE.txt
  
  # Remove log4j.properties file. It is not needed by scout directly, and may 
--- 127,145 ----
  %prep
  %setup -q -n ws-scout-%{real_version}
! 
  # Already clean
  #find . -name "*.jar" | xargs -t rm
+ 
+ cp -a %{SOURCE8} build.xml
+ cp -a %{SOURCE9} maven-build.xml
+ cp -a %{SOURCE10} modules/scout/build.xml
+ cp -a %{SOURCE11} modules/scout/maven-build.xml
+ 
  # These tests need a running juddi server instance
  rm modules/scout/src/test/org/apache/ws/scout/registry/publish/PublishConceptTest.java
  rm modules/scout/src/test/org/apache/ws/scout/registry/query/JAXRQueryTest.java
+ 
  # for checkstyle
! cp -p LICENSE.TXT modules/jaxr-api/LICENSE.txt
  
  # Remove log4j.properties file. It is not needed by scout directly, and may 

--- NEW FILE: ws-scout0-modules-scout-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<project name="scout" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Import maven-build.xml into the current project                        -->
  <!-- ====================================================================== -->

  <import file="maven-build.xml"/>
  
  <!-- ====================================================================== -->
  <!-- Help target                                                            -->
  <!-- ====================================================================== -->

  <target name="help">
    <echo message="Please run: $ant -projecthelp"/>
  </target>

</project>




More information about the JPackage-commits mailing list