[Jpackage-commits] dist/excalibur/devel .cvsignore, 1.1, 1.2 excalibur-1.0-jpp-depmap.xml, NONE, 1.1 excalibur-r508111-00-pom_xml.patch, NONE, 1.1 excalibur-r508111-components-xmlutil-01-pom_xml.patch, NONE, 1.1 excalibur-r508111-deprecated-component-test-03-pom_xml.patch, NONE, 1.1 excalibur-r508111-fortress-container-impl-02-pom_xml.patch, NONE, 1.1 excalibur-r508111-fortress-examples-04-pom_xml.patch, NONE, 1.1 excalibur-r508111-fortress-platform-05-script.patch, NONE, 1.1 excalibur-r508111-fortress-platform-06-wrapper_conf.patch, NONE, 1.1 excalibur-settings.xml, NONE, 1.1 excalibur.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:08:16 CEST 2008


Update of /home/projects/jpackage/cvs/dist/excalibur/devel
In directory ryu.zarb.org:/tmp/cvs-serv26462/devel

Modified Files:
	.cvsignore sources 
Added Files:
	excalibur-1.0-jpp-depmap.xml 
	excalibur-r508111-00-pom_xml.patch 
	excalibur-r508111-components-xmlutil-01-pom_xml.patch 
	excalibur-r508111-deprecated-component-test-03-pom_xml.patch 
	excalibur-r508111-fortress-container-impl-02-pom_xml.patch 
	excalibur-r508111-fortress-examples-04-pom_xml.patch 
	excalibur-r508111-fortress-platform-05-script.patch 
	excalibur-r508111-fortress-platform-06-wrapper_conf.patch 
	excalibur-settings.xml excalibur.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/excalibur/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:07:49 -0000	1.1
--- .cvsignore	28 May 2008 18:08:13 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ excalibur-1.0-build-files.tar.gz
+ excalibur-src-r508111-15022007.tar.gz

--- NEW FILE: excalibur-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: excalibur-r508111-components-xmlutil-01-pom_xml.patch ---
--- components/xmlutil/pom.xml.sav01	2007-02-15 20:47:05.000000000 +0100
+++ components/xmlutil/pom.xml	2008-01-04 22:44:12.000000000 +0100
@@ -42,6 +42,12 @@
       <version>6.5.3</version>
     </dependency>
     <dependency>
+      <artifactId>saxon-aelfred</artifactId>
+      <groupId>saxon</groupId>
+      <scope>provided</scope>
+      <version>6.5.3</version>
+    </dependency>
+    <dependency>
       <artifactId>saxon</artifactId>
       <groupId>net.sf.saxon</groupId>
       <scope>provided</scope>
@@ -92,6 +98,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>serializer</artifactId>
+      <version>2.6.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>saxpath</groupId>
       <artifactId>saxpath</artifactId>
       <scope>provided</scope>
@@ -128,4 +140,4 @@
     <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</url>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</developerConnection>
   </scm>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: excalibur-r508111-fortress-platform-06-wrapper_conf.patch ---
--- fortress/platform/src/conf/wrapper.conf.sav       2007-04-05 14:37:10.000000000 +0200
+++ fortress/platform/src/conf/wrapper.conf   2007-04-05 14:56:07.000000000 +0200
@@ -15,10 +15,17 @@

 # Java Classpath (include wrapper.jar)  Add class path elements as
 #  needed starting from 1
-wrapper.java.classpath.1=../lib/*.jar
+wrapper.java.classpath.1=/usr/share/java/tanukiwrapper.jar
+wrapper.java.classpath.2=/usr/share/java/excalibur/*.jar
+wrapper.java.classpath.3=/usr/share/java/d-haven-mpool.jar
+wrapper.java.classpath.4=/usr/share/java/d-haven-event.jar
+wrapper.java.classpath.5=/usr/share/java/concurrent.jar
+wrapper.java.classpath.6=/usr/share/java/commons-collections.jar
+wrapper.java.classpath.7=/usr/share/java/commons-beanutils.jar
+wrapper.java.classpath.8=/usr/share/java/commons-logging.jar

 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=../lib
+wrapper.java.library.path.1=/usr/lib

 # Java Additional Parameters
 #wrapper.java.additional.1=
@@ -31,9 +38,9 @@

 # Application parameters.  Add parameters as needed starting from 1
 wrapper.app.parameter.1=org.apache.avalon.fortress.examples.swing.Main
-wrapper.app.parameter.2=../conf/fortress.xconf
-wrapper.app.parameter.3=../conf/fortress.xlog
-wrapper.app.parameter.4=../conf/fortress.instruments
+wrapper.app.parameter.2=/usr/share/fortress/conf/fortress.xconf
+wrapper.app.parameter.3=/usr/share/fortress/conf/fortress.xlog
+wrapper.app.parameter.4=/usr/share/fortress/conf/fortress.instruments

 #********************************************************************
 # Wrapper Logging Properties
@@ -45,7 +52,7 @@
 wrapper.console.loglevel=INFO

 # Log file to use for wrapper output logging.
-wrapper.logfile=../logs/wrapper.log
+wrapper.logfile=/usr/share/fortress/logs/wrapper.log

 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/excalibur/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:07:49 -0000	1.1
--- sources	28 May 2008 18:08:13 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 27b5feb73bb55133b6170b8513b68ff7  excalibur-1.0-build-files.tar.gz
+ 334c0f1ce951bee43582557ae883cc24  excalibur-src-r508111-15022007.tar.gz

--- NEW FILE: excalibur-1.0-jpp-depmap.xml ---
<dependencies>
  <dependency>
    <maven>
      <groupId>xalan</groupId>
      <artifactId>serializer</artifactId>
      <version>2.6.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>xalan-j2-serializer</artifactId>
      <version>2.7.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>javax.mail</groupId>
      <artifactId>mail</artifactId>
      <version>1.4</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>classpathx-mail-1.3.1-monolithic</artifactId>
      <version>1.1.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>d-haven-event</groupId>
      <artifactId>event</artifactId>
      <version>1.0.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>d-haven-event</artifactId>
      <version>1.1.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>d-haven-event</groupId>
      <artifactId>d-haven-event</artifactId>
      <version>1.0.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>d-haven-event</artifactId>
      <version>1.1.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>generama</groupId>
      <artifactId>qdox</artifactId>
      <version>20051211.114207</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>qdox</artifactId>
      <version>1.5</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>commons-vfs</groupId>
      <artifactId>commons-vfs</artifactId>
      <version>20050307052300</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>commons-vfs</artifactId>
      <version>1.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>concurrent</groupId>
      <artifactId>concurrent</artifactId>
      <version>1.3.4</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>concurrent</artifactId>
      <version>1.3.4</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>junitperf</groupId>
      <artifactId>junitperf</artifactId>
      <version>1.8</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>junitperf</artifactId>
      <version>1.9.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>jisp</groupId>
      <artifactId>jisp</artifactId>
      <version>2.5.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>jisp2</artifactId>
      <version>2.5.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>net.sf.saxon</groupId>
      <artifactId>saxon</artifactId>
      <version>7.9.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>saxon7</artifactId>
      <version>7.9.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>saxon</groupId>
      <artifactId>saxon</artifactId>
      <version>6.5.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>saxon</artifactId>
      <version>6.5.3</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>saxon</groupId>
      <artifactId>saxon-aelfred</artifactId>
      <version>6.5.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>saxon-aelfred</artifactId>
      <version>6.5.3</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>saxpath</groupId>
      <artifactId>saxpath</artifactId>
      <version>1.0-FCS</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>jaxen</artifactId>
      <version>1.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>xml-resolver</groupId>
      <artifactId>xml-resolver</artifactId>
      <version>1.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>xml-commons-resolver11</artifactId>
      <version>1.3.03</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>hsqldb</groupId>
      <artifactId>hsqldb</artifactId>
      <version>1.8.0.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>hsqldb</artifactId>
      <version>1.8.0.7</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>bcel</groupId>
      <artifactId>bcel</artifactId>
      <version>5.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>bcel</artifactId>
      <version>5.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>d-haven-mpool</groupId>
      <artifactId>managed-pool</artifactId>
      <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>d-haven-mpool</artifactId>
      <version>1.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>logkit</groupId>
      <artifactId>logkit</artifactId>
      <version>1.0.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>avalon-logkit</artifactId>
      <version>2.2.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>avalon-framework</groupId>
      <artifactId>avalon-framework</artifactId>
      <version>4.1.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>avalon-framework</artifactId>
      <version>4.3.1</version>
    </jpp>
  </dependency>

</dependencies>

--- NEW FILE: excalibur-r508111-fortress-container-impl-02-pom_xml.patch ---
--- fortress/container-impl/pom.xml.sav	2007-03-29 13:15:18.000000000 +0200
+++ fortress/container-impl/pom.xml	2007-03-29 13:16:09.000000000 +0200
@@ -89,6 +89,11 @@
       <version>5.1</version>
     </dependency>
     <dependency>
+      <artifactId>concurrent</artifactId>
+      <groupId>concurrent</groupId>
+      <version>1.3.4</version>
+    </dependency>
+    <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.7.0</version>
@@ -115,4 +120,4 @@
     <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</url>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</developerConnection>
   </scm>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: excalibur.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
[...4488 lines suppressed...]
- Add alternate depmap frags for avalon-framework and -logkit
- Add (B)Rs

* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 1:1.0-0.r508111.2jpp
- Add more poms
- Bump epoch

* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:4.3-7jpp
- Fix changelog
* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:2.1-10jpp
- Fix changelog
* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:2.1-3jpp
- Fix changelog
* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:2.1-2jpp
- Fix changelog
* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
- Fix changelog
* Thu Apr 05 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1jpp
- First JPP-1.7 build from this codebase


--- NEW FILE: excalibur-r508111-fortress-examples-04-pom_xml.patch ---
--- fortress/examples/pom.xml.sav	2007-04-05 13:18:08.000000000 +0200
+++ fortress/examples/pom.xml	2007-04-05 13:18:58.000000000 +0200
@@ -44,10 +44,30 @@
       <version>2.3</version>
     </dependency>
   </dependencies>
-  <build />
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.excalibur.fortress.meta</groupId>
+        <artifactId>maven-fortress-plugin</artifactId>
+        <version>1.3.1</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>collect-metainfo</goal>
+            </goals>
+            <configuration>
+              <baseDir>${basedir}/src/java</baseDir>
+              <destDir>${basedir}/target/classes</destDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <scm>
     <connection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</connection>
     <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</url>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</developerConnection>
   </scm>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: excalibur-r508111-deprecated-component-test-03-pom_xml.patch ---
--- deprecated/component-tests/pom.xml.sav	2007-03-29 13:45:21.000000000 +0200
+++ deprecated/component-tests/pom.xml	2007-03-29 13:46:35.000000000 +0200
@@ -46,10 +46,21 @@
       <version>3.8.2</version>
     </dependency>
   </dependencies>
-  <build />
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+            <testFailureIgnore>true</testFailureIgnore>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <scm>
     <connection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</connection>
     <url>https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</url>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/tags/excalibur-first-maven2-release</developerConnection>
   </scm>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: excalibur-r508111-fortress-platform-05-script.patch ---
--- fortress/platform/src/bin/fortress.sh.sav 2007-04-05 14:40:01.000000000 +0200
+++ fortress/platform/src/bin/fortress.sh     2007-04-05 14:41:16.000000000 +0200
@@ -1,4 +1,5 @@
 #! /bin/sh
+set -x

 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -33,8 +34,8 @@
 APP_LONG_NAME="Test Wrapper Sample Application"

 # Wrapper
-WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../conf/wrapper.conf"
+WRAPPER_CMD="/usr/sbin/tanukiwrapper"
+WRAPPER_CONF="/usr/share/fortress/conf/wrapper.conf"

 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.

--- NEW FILE: excalibur-r508111-00-pom_xml.patch ---
--- pom.xml.sav00	2007-02-15 20:47:05.000000000 +0100
+++ pom.xml	2008-01-08 19:16:14.000000000 +0100
@@ -76,7 +76,19 @@
         <inherited>true</inherited>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>false</aggregate>
+        </configuration>
         <executions>
+<!--
+          <execution>
+            <id>generate-javadocs</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>javadoc</goal>
+            </goals>
+          </execution>
+-->
           <execution>
             <id>attach-javadocs</id>
             <phase>deploy</phase>
@@ -86,6 +98,7 @@
           </execution>
         </executions>
       </plugin>
+<!--
       <plugin>
         <inherited>true</inherited>
         <groupId>org.apache.maven.plugins</groupId>
@@ -103,6 +116,7 @@
           <passphrase>yourgpgpassphrasehere</passphrase>
         </configuration>
       </plugin>
+-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>




More information about the JPackage-commits mailing list