Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24319/libs
Modified Files:
axis.info commons-beanutils.info commons-collections.info
commons-daemon.info commons-dbcp.info commons-digester.info
commons-discovery.info commons-fileupload.info
commons-lang.info commons-logging.info commons-modeler.info
commons-pool.info commons-resources.info
commons-validator.info mx4j.info mx4j.patch
Added Files:
axis.patch commons-resources.patch jaas.info
Log Message:
more java stuff
Index: commons-resources.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-resources.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- commons-resources.info 19 Nov 2003 15:11:15 -0000 1.1
+++ commons-resources.info 9 Jul 2004 00:23:17 -0000 1.2
@@ -1,28 +1,43 @@
Package: commons-resources
Version: 0.0
-Revision: 0.20030906.1
+Revision: 0.20040708.1
CustomMirror: <<
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:custom:%n-src-20030906.tar.gz
-Source-MD5: f80d39cd5b8523c708ca7e39acfc0e0b
+Source: mirror:custom:%n-src-20040708.tar.gz
+Source-MD5: d17b3d7c5cb717e0fe0fe5c693968516
SourceDirectory: %n
-BuildDepends: ant, commons-discovery, jakarta-servletapi
-Depends: commons-discovery
+BuildDepends: ant (>= 1.6.1-1), commons-collections (>= 3.1-1), commons-digester (>=
1.5-2), commons-discovery (>= 0.2-2), commons-logging (>= 1.0.4-1),
jakarta-servletapi, system-java14-dev, xerces-j
+Depends: commons-collections (>= 3.1-1), commons-digester (>= 1.5-2),
commons-discovery (>= 0.2-2), commons-logging (>= 1.0.4-1), jakarta-servletapi,
system-java14 | system-java15, xerces-j
PatchScript: <<
cp LICENSE.txt ../LICENSE
+ sed -e 's,@BUILDDIR@,%b,g' %a/%n.patch | patch -p1
+<<
+CompileScript: <<
+#!/bin/sh
+
+ JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
+ export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
+ install -d -m 755 "%b/sandbox/resources/src/test"
+ ant dist \
+ -Ddefaulttargetdir="%b/sandbox/resources/target" \
+ -Dlibdir="%b/sandbox/resources/target/lib" \
+ -Dclassesdir="%b/sandbox/resources/target/classes" \
+ -Dtestclassesdir="%b/sandbox/resources/target/test-classes" \
+ -Dtestreportdir="%b/sandbox/resources/target/test-reports"
<<
-CompileScript: ant dist
-JarFiles: dist/*.jar
InstallScript: <<
- mkdir -p %i/share/doc/%n
- (cd dist/docs; gnutar -cf - .) | (cd %i/share/doc/%n; gnutar -xf -)
- find %i/share/doc/%n -type d -exec chmod 755 {} \;
- find %i/share/doc/%n -type f -exec chmod 644 {} \;
+ mkdir -p %i/share/doc/%n
+ (cd dist/docs; gnutar -cf - .) | (cd %i/share/doc/%n; gnutar -xf -)
+ find %i/share/doc/%n -type d -exec chmod 755 {} \;
+ find %i/share/doc/%n -type f -exec chmod 644 {} \;
+ mv dist/*.jar dist/%n.jar
<<
-DocFiles: dist/LICENSE
+JarFiles: dist/*.jar
+DocFiles: dist/LICENSE*
Homepage: http://jakarta.apache.org/commons/resources/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Description: Jakarta Commons - Resources
Index: commons-validator.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-validator.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-validator.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-validator.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -1,19 +1,27 @@
Package: commons-validator
Version: 1.0.2
-Revision: 1
+Revision: 2
Source: http://www.apache.org/dist/jakarta/commons/validator/source/%n-%v-src.tar.gz
Source-MD5: 917cf3d82847e497e11f9e86488d4b56
SourceDirectory: %n-%v-src
-BuildDepends: ant, junit, commons-beanutils, commons-collections, commons-digester,
commons-logging, jakarta-oro
-Depends: commons-beanutils, commons-collections, commons-digester, commons-logging,
jakarta-oro
-CompileScript: ant dist -Djunit.jar="%p/share/java/junit/junit.jar"
-Dcommons-beanutils.jar="%p/share/java/commons-beanutils/commons-beanutils.jar"
-Dcommons-collections.jar="%p/share/java/commons-collections/commons-collections.jar"
-Dcommons-digester.jar="%p/share/java/commons-digester/commons-digester.jar"
-Dcommons-logging.jar="%p/share/java/commons-logging/commons-logging.jar"
-Doro.jar="%p/share/java/jakarta-oro/jakarta-oro.jar"
-JarFiles: dist/*.jar
+BuildDepends: ant (>= 1.6.1-1), junit, commons-beanutils (>= 1.6.1-2),
commons-collections (>= 3.1-1), commons-digester (>= 1.5-2), commons-logging (>=
1.0.4-1), jakarta-oro (>= 2.0.8-1), system-java13-dev
+Depends: commons-beanutils (>= 1.6.1-2), commons-collections (>= 3.1-1),
commons-digester (>= 1.5-2), commons-logging (>= 1.0.4-1), jakarta-oro (>= 2.0.8-1)
+CompileScript: <<
+#!/bin/sh
+
+ JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
+ export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
+ #ant dist -Djunit.jar="%p/share/java/junit/junit.jar"
-Dcommons-beanutils.jar="%p/share/java/commons-beanutils/commons-beanutils.jar"
-Dcommons-collections.jar="%p/share/java/commons-collections/commons-collections.jar"
-Dcommons-digester.jar="%p/share/java/commons-digester/commons-digester.jar"
-Dcommons-logging.jar="%p/share/java/commons-logging/commons-logging.jar"
-Doro.jar="%p/share/java/jakarta-oro/jakarta-oro.jar"
+ ant dist
+<<
InstallScript: <<
mkdir -p %i/share/doc/%n
(cd dist/docs; gnutar -cf - .) | (cd %i/share/doc/%n; gnutar -xf -)
find %i/share/doc/%n -type d -exec chmod 755 {} \;
find %i/share/doc/%n -type f -exec chmod 644 {} \;
<<
+JarFiles: dist/*.jar
DocFiles: dist/LICENSE* dist/RELEASE*
Homepage: http://jakarta.apache.org/commons/validator/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Index: mx4j.info
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/mx4j.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mx4j.info 8 Jul 2004 21:58:59 -0000 1.3
+++ mx4j.info 9 Jul 2004 00:23:17 -0000 1.4
@@ -3,31 +3,37 @@
Revision: 1
Source: mirror:sourceforge:%n/%n-%v-src.tar.gz
Source-MD5: c158ad005a01ea2a7b1e794947502b2d
-BuildDepends: javamail, jetty, jython, system-java13-dev
-Depends: system-java13 | system-java14 | system-java15
+Patch: %n.patch
+BuildDepends: axis, javamail, jython, system-java14-dev
+Depends: axis, javamail, jython, system-java14 | system-java15
NoSourceDirectory: true
CompileScript: <<
-#!/bin/sh
+#!/bin/sh -ex
- JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
+ JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.4' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
+ find . -name jetty -exec rm -rf {} \; || :
pushd build
ant release
<<
-JarFiles: lib/*.jar
+JarFiles: dist/lib/*.jar
InstallScript: <<
- mkdir -p %i/share/doc/%n
- cp -R docs/* %i/share/doc/%n/
- cp -R examples %i/share/doc/%n/
- find %i/share/doc/%n -type d -exec chmod 755 {} \;
- find %i/share/doc/%n -type f -exec chmod 644 {} \;
+#!/bin/sh -ex
+
+ install -d -m 755 %i/share/doc/%n
+ mv dist/docs/api/* %i/share/doc/%n/
+ mv dist/examples %i/share/doc/%n/
+
+ find %i/share/doc/%n -type d -exec chmod 755 {} \;
+ find %i/share/doc/%n -type f -exec chmod 644 {} \;
<<
-DocFiles: BCEL-LICENSE Jython-LICENSE LICENSE Log4J-LICENSE README XDoclet-LICENSE
+DocFiles: *LICENSE* BUILD* README*
Homepage: http://mx4j.sourceforge.net/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Description: Java Management Extensions
DescDetail: <<
MX4J is an initiative to build an Open Source implementation for the
-JMX technology specification version 1.1, and to build related tools.
+JMX technology specification, and to build related tools.
<<
License: Restrictive/Distributable
Index: commons-discovery.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-discovery.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-discovery.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-discovery.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -14,6 +14,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
JarFiles: dist/*.jar
Index: commons-daemon.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-daemon.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-daemon.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-daemon.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -13,6 +13,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
BuildDepends: ant (>= 1.6.1-1), system-java13-dev
Index: commons-pool.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-pool.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-pool.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-pool.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -11,6 +11,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
JarFiles: dist/*.jar
--- NEW FILE: commons-resources.patch ---
diff -uNr commons-resources/build.xml commons-resources-new/build.xml
--- commons-resources/build.xml 2004-07-08 08:01:52.000000000 -0400
+++ commons-resources-new/build.xml 2004-07-08 20:16:16.000000000 -0400
@@ -4,17 +4,17 @@
on date July 5 2004, time 1441-->
<project default="jar" name="commons-resources" basedir=".">
- <property name="defaulttargetdir"
value="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/target">
+ <property name="defaulttargetdir" value="@BUILDDIR@/sandbox/resources/target">
</property>
- <property name="libdir"
value="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/target/lib">
+ <property name="libdir" value="@BUILDDIR@/sandbox/resources/target/lib">
</property>
- <property name="classesdir"
value="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/target/classes">
+ <property name="classesdir" value="@BUILDDIR@/sandbox/resources/target/classes">
</property>
- <property name="testclassesdir"
value="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/target/test-classes">
+ <property name="testclassesdir"
value="@BUILDDIR@/sandbox/resources/target/test-classes">
</property>
- <property name="testclassesdir"
value="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/target/test-classes">
+ <property name="testclassesdir"
value="@BUILDDIR@/sandbox/resources/target/test-classes">
</property>
- <property name="testreportdir"
value="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/target/test-reports">
+ <property name="testreportdir"
value="@BUILDDIR@/sandbox/resources/target/test-reports">
</property>
<property name="distdir" value="dist">
</property>
@@ -68,7 +68,7 @@
</fileset>
</copy>
</target>
- <target name="jar" description="o Create the jar" depends="compile,test">
+ <target name="jar" description="o Create the jar" depends="compile">
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
</jar>
</target>
@@ -138,7 +138,7 @@
</classpath>
</javac>
<copy todir="${testclassesdir}">
- <fileset dir="/home/craigmcc/Apache/jakarta-commons-sandbox/resources/src/test">
+ <fileset dir="@BUILDDIR@/sandbox/resources/src/test">
<include name="**/*.properties">
</include>
<include name="**/*.xml">
@@ -169,24 +169,8 @@
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar";>
- </get>
- <get dest="${libdir}/commons-beanutils-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.5.jar";>
- </get>
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar";>
- </get>
- <get dest="${libdir}/commons-digester-1.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.3.jar";>
- </get>
- <get dest="${libdir}/commons-discovery-0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.1.jar";>
- </get>
- <get dest="${libdir}/commons-logging-1.0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.jar";>
- </get>
- <get dest="${libdir}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.jar";>
- </get>
<get dest="${libdir}/hibernate-2.1.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/hibernate/jars/hibernate-2.1.3.jar";>
</get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
- </get>
<get dest="${libdir}/dom4j-1.4.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.4.jar";>
</get>
<get dest="${libdir}/cglib-full-2.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/cglib/jars/cglib-full-2.0.jar";>
@@ -197,12 +181,6 @@
</get>
<get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar";>
</get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
- </get>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar";>
- </get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar";>
- </get>
</target>
<target name="install-maven">
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
@@ -210,4 +188,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
-</project>
\ No newline at end of file
+</project>
Index: commons-lang.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-lang.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-lang.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-lang.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -14,6 +14,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
JarFiles: dist/*.jar
Index: commons-modeler.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-modeler.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- commons-modeler.info 19 Nov 2003 15:11:15 -0000 1.1
+++ commons-modeler.info 9 Jul 2004 00:23:17 -0000 1.2
@@ -1,22 +1,29 @@
Package: commons-modeler
Version: 1.1
-Revision: 1
+Revision: 2
Source:
http://www.apache.org/dist/jakarta/commons/modeler/source/modeler-%v-src.tar.gz
Source-MD5: 6de043186a348758c845f1a2321e8308
SourceDirectory: %n-%v-src
-BuildDepends: ant, commons-digester, mx4j
-Depends: commons-digester, mx4j
+BuildDepends: ant (>= 1.6.1-1), commons-digester (>= 1.5-2), mx4j, system-java13-dev
+Depends: commons-digester (>= 1.5-2), mx4j, system-java13 | system-java14 |
system-java15
PatchScript: <<
touch ../LICENSE
<<
-CompileScript: ant dist
-JarFiles: dist/*.jar
+CompileScript: <<
+#!/bin/sh
+
+ JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
+ export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
+ ant dist
+<<
InstallScript: <<
mkdir -p %i/share/doc/%n
(cd dist/docs; gnutar -cf - .) | (cd %i/share/doc/%n; gnutar -xf -)
find %i/share/doc/%n -type d -exec chmod 755 {} \;
find %i/share/doc/%n -type f -exec chmod 644 {} \;
<<
+JarFiles: dist/*.jar
DocFiles: PROPOSAL.html RELEASE-NOTES.txt STATUS.html
Homepage: http://jakarta.apache.org/commons/modeler.html
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
--- NEW FILE: axis.patch ---
diff -uNr axis-1_2beta/build.xml axis-1_2beta-patched/build.xml
--- axis-1_2beta/build.xml 2004-03-31 13:42:58.000000000 -0500
+++ axis-1_2beta-patched/build.xml 2004-07-08 18:03:59.000000000 -0400
@@ -213,11 +213,6 @@
</manifest>
</jar>
<copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
- <copy file="${commons-logging.jar}" toDir="${build.lib}"/>
- <copy file="${commons-discovery.jar}" toDir="${build.lib}"/>
- <copy file="${log4j-core.jar}" toDir="${build.lib}"/>
- <copy file="${src.dir}/log4j.properties"
- toDir="${build.lib}"/>
<!-- Build the new org.apache.axis.tools.ant stuff -->
<mkdir dir="${axis.home}/tools/lib" />
Index: mx4j.patch
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/mx4j.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mx4j.patch 8 Jul 2004 21:58:59 -0000 1.1
+++ mx4j.patch 9 Jul 2004 00:23:17 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNr mx/build/build.xml mx-new/build/build.xml
+diff -uNr mx/build/build.xml mx-patched/build/build.xml
--- mx/build/build.xml 2004-04-05 07:09:12.000000000 -0400
-+++ mx-new/build/build.xml 2004-07-08 16:02:02.000000000 -0400
++++ mx-patched/build/build.xml 2004-07-08 19:05:32.000000000 -0400
@@ -205,11 +205,6 @@
<antcall target="jython-present"/>
@@ -13,3 +13,154 @@
<antcall target="jetty-present"/>
</target>
+@@ -293,7 +288,6 @@
+ <exclude name="mx4j/tools/mail/**" unless="javamail.present"/>
+ <exclude name="mx4j/tools/jython/**" unless="jython.present"/>
+ <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
+- <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
+ <exclude name="mx4j/tools/remote/soap/web/jetty/**" unless="jetty.present"/>
+ <exclude name="mx4j/tools/heartbeat/**" if="releasing"/>
+ <exclude name="mx4j/tools/connector/**" if="releasing"/>
+@@ -370,7 +364,6 @@
+ <exclude name="test/mx4j/tools/connector/**" if="releasing"/>
+ <exclude name="test/mx4j/tools/adaptor/rmi/**" if="releasing"/>
+ <exclude name="test/mx4j/tools/adaptor/interceptor/**" if="releasing"/>
+- <exclude name="test/**/*SecurityManager*" unless="jdk14.present"/>
+ <classpath refid="classpath"/>
+ </javac>
+
+@@ -390,7 +383,6 @@
+ <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}"
debug="on" deprecation="on" encoding="US-ASCII">
+ <classpath refid="classpath"/>
+ <exclude name="mx4j/examples/tools/xdoclet/**"/>
+- <exclude name="mx4j/examples/remote/rmi/ssl/**" unless="jdk14.present"/>
+ </javac>
+
+ <rmic base="${examples.classes.dir}"
+@@ -442,45 +434,7 @@
+ </javadoc>
+ </target>
+
+- <target name="docs" description="Builds the MX4J documentation">
+- <unzip src="${docbook.dtd.zip.file}" dest="${docs.src.dir}/docbook"/>
+- <unzip src="${docbook.xsl.zip.file}" dest="${docs.src.dir}/docbookx"/>
+- <mkdir dir="${dist.docs.dir}"/>
+-
+- <style processor="trax"
+- basedir="${docs.src.dir}"
+- destdir="${dist.docs.dir}"
+- force="yes"
+- style="${docs.src.dir}/xsl/mx4j-chunk.xsl"
+- includes="${root.document.name}"
+- classpathref="lib.classpath"
+- />
+-
+- <delete dir="${docs.src.dir}/docbook" quiet="true"/>
+- <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
+-
+- <!-- Bug in Ant forces this move, since destdir of the style task does not
work -->
+- <move todir="${dist.docs.dir}">
+- <fileset dir="${basedir}/build">
+- <include name="*.html"/>
+- </fileset>
+- </move>
+-
+- <copy todir="${dist.docs.dir}">
+- <fileset dir="${docs.src.dir}">
+- <include name="*.css"/>
+- </fileset>
+- </copy>
+-
+- <mkdir dir="${dist.docs.dir}/images"/>
+- <copy todir="${dist.docs.dir}/images">
+- <fileset dir="${docs.src.dir}/images">
+- <include name="*.png"/>
+- <include name="*.gif"/>
+- <include name="*.jpg"/>
+- </fileset>
+- </copy>
+- </target>
++ <target name="docs" description="Builds the MX4J documentation" />
+
+ <target name="main" depends="tests, compile.examples"/>
+
+@@ -552,50 +506,7 @@
+
+ </target>
+
+- <target name="tests" description="Prepares the environment for the tests"
depends="flags, compile.tests">
+- <mkdir dir="${dist.test.dir}"/>
+-
+- <copy todir="${dist.test.dir}">
+- <fileset dir="${lib.dir}">
+- <include name="junit.jar"/>
+- <include name="xmlunit.jar"/>
+- <include name="xml-apis.jar"/>
+- <include name="xercesImpl.jar"/>
+- <include name="xalan.jar"/>
+- <include name="commons-logging.jar"/>
+- <include name="log4j.jar"/>
+- <include name="bcel.jar"/>
+- <include name="axis.jar"/>
+- <include name="jaxrpc.jar"/>
+- <include name="saaj.jar"/>
+- <include name="wsdl4j.jar"/>
+- <include name="commons-discovery.jar"/>
+- <include name="org.mortbay.jetty.jar"/>
+- <!-- Also jars downloaded apart -->
+- <include name="servlet.jar"/>
+- <include name="jython.jar"/>
+- <include name="jsse.jar"/>
+- <include name="jcert.jar"/>
+- <include name="jnet.jar"/>
+- <include name="jaas.jar"/>
+- <include name="jmxri.jar"/>
+- <include name="jmxremote.jar"/>
+- <include name="jmxremote_optional.jar"/>
+- </fileset>
+- <fileset dir="${dist.lib.dir}">
+- <include name="*.jar"/>
+- <include name="*.war"/>
+- <exclude name="${name}.jar"/>
+- <exclude name="${name}-remote.jar"/>
+- </fileset>
+- <fileset dir="${etc.dir}">
+- <include name="log4j.xml"/>
+- <include name="key.store"/>
+- <include name="trust.store"/>
+- </fileset>
+- </copy>
+-
+- </target>
++ <target name="tests" description="Prepares the environment for the tests"
depends="flags" />
+
+ <target name="singletest" description="Executes the test class defined by the
system property 'testname'" depends="tests">
+ <junit printsummary="withOutAndErr" fork="yes" dir="${basedir}">
+@@ -635,7 +546,6 @@
+ <exclude name="test/mx4j/remote/**" unless="jaas.present"/>
+ <exclude name="test/mx4j/tools/remote/**" unless="jaas.present"/>
+ <exclude name="test/mx4j/tools/jython/**" unless="jython.present"/>
+- <exclude name="test/**/*SecurityManager*" unless="jdk14.present"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+diff -uNr mx/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java
mx-patched/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java
+--- mx/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java 2004-04-05
07:09:10.000000000 -0400
++++ mx-patched/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java
2004-07-08 18:46:04.000000000 -0400
+@@ -21,7 +21,6 @@
+ import mx4j.tools.remote.AbstractJMXConnectorServer;
+ import mx4j.tools.remote.soap.web.axis.SimpleAxisWebContainer;
+ import mx4j.tools.remote.soap.web.WebContainer;
+-import mx4j.tools.remote.soap.web.jetty.JettyWebContainer;
+
+ /**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Simone Bordet</a>
+@@ -94,8 +93,6 @@
+ {
+ // Create and start an embedded web container
+ String webContainerClassName = environment == null ? null :
(String)environment.get(EMBEDDED_WEB_CONTAINER_CLASS);
+- // Not present, by default use Jetty
+- if (webContainerClassName == null || webContainerClassName.length() == 0)
webContainerClassName = JettyWebContainer.class.getName();
+ webContainer = createWebContainer(webContainerClassName, environment);
+ // Jetty not present, use AXIS
+ if (webContainer == null) webContainer =
createWebContainer(SimpleAxisWebContainer.class.getName(), environment);
Index: commons-logging.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-logging.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-logging.info 8 Jul 2004 13:30:59 -0000 1.2
+++ commons-logging.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -15,6 +15,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant compile javadoc
<<
JarFiles: target/*.jar
Index: commons-digester.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-digester.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-digester.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-digester.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -17,6 +17,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
BuildDepends: ant (>= 1.6.1-1), commons-logging (>= 1.0.4-1), commons-collections (>=
3.1-1), commons-beanutils (>= 1.6.1-2), system-java13-dev
Index: axis.info
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/axis.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- axis.info 8 Jul 2004 21:58:59 -0000 1.1
+++ axis.info 9 Jul 2004 00:23:17 -0000 1.2
@@ -31,7 +31,7 @@
# documentation
mv docs/* %i/share/doc/%n/
- mv examples %i/share/doc/%n/
+ mv samples %i/share/doc/%n/
# webapp
pushd webapps
Index: commons-collections.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-collections.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-collections.info 8 Jul 2004 13:30:59 -0000 1.2
+++ commons-collections.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -11,6 +11,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
JarFiles: *.jar
--- NEW FILE: jaas.info ---
Package: jaas
Version: 1.0
Revision: 1
Depends: system-java13 | system-java14 | system-java15
Source: http://ranger.befunk.com/fink/jaas-1_0_01.zip
Source-MD5: 6cbe149a1081e2aba1588adba328c5c1
SourceDirectory: %n1_0_01
CompileScript: true
InstallScript: <<
#!/bin/sh -xe
mkdir -p %i/share/doc/%n
mv doc/* %i/share/doc/%n/
find %i/share/doc/%n -type d -exec chmod 755 {} \;
find %i/share/doc/%n -type f -exec chmod 644 {} \;
<<
JarFiles: lib/*.jar
Homepage: http://java.sun.com/products/jaas/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Description: Java Authentication and Authorization Service
DescDetail: <<
The Java Authentication and Authorization Service (JAAS) is a
set of APIs that enable services to authenticate and enforce
access controls upon users. It implements a Java technology
version of the standard Pluggable Authentication Module (PAM)
framework, and supports user-based authorization.
<<
License: Restrictive/Distributable
Index: commons-beanutils.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-beanutils.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-beanutils.info 8 Jul 2004 13:30:59 -0000 1.2
+++ commons-beanutils.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -14,6 +14,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant compile jar javadoc
<<
JarFiles: dist/*.jar
Index: commons-dbcp.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-dbcp.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-dbcp.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-dbcp.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -11,6 +11,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.4' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
JarFiles: dist/*.jar
Index: commons-fileupload.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/commons-fileupload.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commons-fileupload.info 8 Jul 2004 21:58:59 -0000 1.2
+++ commons-fileupload.info 9 Jul 2004 00:23:17 -0000 1.3
@@ -15,6 +15,7 @@
JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name include
2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.3' | tail -1`
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
+ export PATH="$JAVA_HOME/bin:$PATH"
ant dist
<<
JarFiles: dist/*.jar
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
