You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2005/12/11 22:06:19 UTC
svn commit: r356022 [21/22] - in /geronimo/branches/1.0: ./ applications/
applications/daytrader/ applications/daytrader/bin/
applications/daytrader/core/ applications/daytrader/derby/
applications/daytrader/ear/ applications/daytrader/ear/src/applicat...
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/data/users.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/data/users.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/data/users.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/cltest/javax/foo/Foo.class
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/cltest/javax/servlet/Servlet.class
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/cltest/mx4j/MBeanDescription.class
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/classes/org/apache/geronimo/tomcat/app/Filter1.class
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/classes/org/apache/geronimo/tomcat/app/Filter2.class
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/classes/org/apache/geronimo/tomcat/app/Servlet1.class
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war5/WEB-INF/wsdl/hello.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war5/WEB-INF/wsdl/hello.wsdl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat-builder/src/test-resources/deployables/war5/WEB-INF/wsdl/hello.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/branches/1.0/modules/tomcat/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/geronimo-logo.png
('svn:keywords' removed)
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/geronimo-logo.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/geronimo-power.gif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+image/gif
Modified: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp (original)
+++ geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-<% response.sendError(404, "No application present at the context root"); %>
+<% response.sendError(404, "No application present at the context root"); %>
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/index.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/tomcat-power.gif
('svn:keywords' removed)
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/tomcat-power.gif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+image/gif
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/tomcat.gif
('svn:keywords' removed)
Propchange: geronimo/branches/1.0/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/ROOT/tomcat.gif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+image/gif
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/data/users.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/data/users.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/data/users.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/tomcat/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/transaction/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/transaction/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/transaction/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/transaction/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/util/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/util/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/util/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/util/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/util/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/util/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/web-builder/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/web-builder/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/web-builder/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/web-builder/src/schema/geronimo-web-1.0.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/web-builder/src/schema/geronimo-web-1.0.xsd
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/web-builder/src/schema/geronimo-web-1.0.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/branches/1.0/modules/web-builder/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/web-builder/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/web-builder/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/webservices/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/webservices/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/webservices/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/modules/webservices/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/modules/webservices/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/modules/webservices/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly Sun Dec 11 12:58:34 2005
@@ -237,7 +237,51 @@
<!-- Create a tar.gz file
Explicitly set execute permission on script files so builds on windows are consistent with unix -->
+ <!-- Establish patternset used by later fixcrlf processing -->
+ <ant:fileset dir="${geronimo.assembly.dest}" >
+ <ant:patternset id="geronimo.fixcrlf.patternset">
+ <ant:include name="**/*.bat" />
+ <ant:include name="**/*.dtd" />
+ <ant:include name="**/*.properties" />
+ <ant:include name="**/*.sh" />
+ <ant:include name="**/*.txt" />
+ <ant:include name="**/*.xml" />
+ <ant:include name="**/*.xsd" />
+ <ant:include name="STATUS" />
+ </ant:patternset>
+ </ant:fileset>
+
+ <!-- Create a zip file -->
+ <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
+ <ant:echo>Preparing CRLF line endings in text based files for zip distribution</ant:echo>
+ <!-- The zip distribution shall have CRLF line endings and is
+ targeted at Windows platforms. Non-Windows platforms should
+ use the tar distribution, as it contains extra file attributes
+ such as permissions.
+ Since we cannot assume we are running on a Windows platform,
+ we fix line endings in the zip distribution to be LF's. -->
+ <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="crlf">
+ <patternset refid="geronimo.fixcrlf.patternset"/>
+ </ant:fixcrlf>
+
+ <ant:zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
+ <ant:zipfileset dir="${geronimo.assembly.dest}/..">
+ <ant:include name="${geronimo.assembly.name}/**"/>
+ <ant:exclude name="${geronimo.assembly.name}/var/log/*.log"/>
+ </ant:zipfileset>
+ </ant:zip>
+ <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="MD5" fileext=".md5"/>
+ <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="SHA" fileext=".sha"/>
+ </j:if>
+ </goal>
+
<j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
+ <ant:echo>Preparing LF line endings in text based files for tar.gz distribution</ant:echo>
+
+ <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
+ <patternset refid="geronimo.fixcrlf.patternset"/>
+ </ant:fixcrlf>
+
<ant:tar longfile="gnu" compression="gzip" tarfile="${maven.build.dir}/${maven.final.name}.tar.gz">
<ant:tarfileset dir="${geronimo.assembly.dest}/..">
<ant:include name="${geronimo.assembly.name}/**"/>
@@ -252,18 +296,15 @@
<checksum file="${maven.build.dir}/${maven.final.name}.tar.gz" algorithm="SHA" fileext=".sha"/>
</j:if>
- <!-- Create a zip file -->
+ <!-- Ensure the files in the assembly directory are left with LF endings
+ for Geronimo developers who may run Geronimo from there. -->
<j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
- <ant:zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
- <ant:zipfileset dir="${geronimo.assembly.dest}/..">
- <ant:include name="${geronimo.assembly.name}/**"/>
- <ant:exclude name="${geronimo.assembly.name}/var/log/*.log"/>
- </ant:zipfileset>
- </ant:zip>
- <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="MD5" fileext=".md5"/>
- <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="SHA" fileext=".sha"/>
+ <j:if test="${context.getVariable('geronimo.assembly.tar') != 'true'}">
+ <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
+ <patternset refid="geronimo.fixcrlf.patternset"/>
+ </ant:fixcrlf>
+ </j:if>
</j:if>
- </goal>
<!-- Maven artifict tags are broken so we must copy by hand -->
<goal name="assemble:install" description="Deploy a binary distribution" prereqs="clean,assemble:package-assembly">
Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
geronimo.assembly.name=geronimo-${pom.currentVersion}
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev,Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
maven.compile.source=1.4
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev,Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
geronimo.dependency.dest=${maven.build.dir}/etc/META-INF
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/plugin.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
maven.compile.source=1.4
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 45927 $ $Date: 2004-09-11 16:29:34 -0700 (Sat, 11 Sep 2004) $
+## $Rev$ $Date$
##
geronimoGroupId=geronimo
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 45927 $ $Date: 2004-09-11 16:29:34 -0700 (Sat, 11 Sep 2004) $
+## $Rev$ $Date$
##
maven.compile.source=1.4
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
izpack_version=3.8.0
geronimo.assembly.name=geronimo-${pom.currentVersion}
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/plugin.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt Sun Dec 11 12:58:34 2005
@@ -1,203 +1,203 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Date Rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt Sun Dec 11 12:58:34 2005
@@ -1,3 +1,3 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Date Rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties Sun Dec 11 12:58:34 2005
@@ -1,39 +1,39 @@
-##
-##
-## Copyright 2005 The Apache Software Foundation
-##
-## Licensed 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.
-##
-
-##
-## $Rev$ $Date$
-##
-
-geronimo.packaging.geronimo_version=1.0
-
-geronimo.packaging.srcDir=${basedir}/src/plan
-geronimo.packaging.planFile=plan.xml
-geronimo.packaging.buildDir=${maven.build.dir}/plan
-geronimo.packaging.buildFile=${geronimo.packaging.buildDir}/${geronimo.packaging.planFile}
-
-geronimo.packaging.repository=${maven.repo.local}
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo.packaging.geronimo_version}/car,geronimo/j2ee-deployer/${geronimo.packaging.geronimo_version}/car
-geronimo.packaging.deployerName=geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=geronimo/geronimo-gbean-deployer/${geronimo.packaging.geronimo_version}/car,*
-
-geronimo.packaging.user=system
-geronimo.packaging.password=manager
-geronimo.packaging.hostname=localhost
-geronimo.packaging.storeName=*:j2eeType=ConfigurationStore,*
-geronimo.packaging.protocol=rmi://${geronimo.packaging.hostname}/jndi/rmi
-geronimo.packaging.sap=/JMXConnector
-geronimo.packaging.url=service:jmx:${geronimo.packaging.protocol}:${geronimo.packaging.sap}
+##
+##
+## Copyright 2005 The Apache Software Foundation
+##
+## Licensed 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.
+##
+
+##
+## $Rev$ $Date$
+##
+
+geronimo.packaging.geronimo_version=1.0
+
+geronimo.packaging.srcDir=${basedir}/src/plan
+geronimo.packaging.planFile=plan.xml
+geronimo.packaging.buildDir=${maven.build.dir}/plan
+geronimo.packaging.buildFile=${geronimo.packaging.buildDir}/${geronimo.packaging.planFile}
+
+geronimo.packaging.repository=${maven.repo.local}
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo.packaging.geronimo_version}/car,geronimo/j2ee-deployer/${geronimo.packaging.geronimo_version}/car
+geronimo.packaging.deployerName=geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=geronimo/geronimo-gbean-deployer/${geronimo.packaging.geronimo_version}/car,*
+
+geronimo.packaging.user=system
+geronimo.packaging.password=manager
+geronimo.packaging.hostname=localhost
+geronimo.packaging.storeName=*:j2eeType=ConfigurationStore,*
+geronimo.packaging.protocol=rmi://${geronimo.packaging.hostname}/jndi/rmi
+geronimo.packaging.sap=/JMXConnector
+geronimo.packaging.url=service:jmx:${geronimo.packaging.protocol}:${geronimo.packaging.sap}
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Date Rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties Sun Dec 11 12:58:34 2005
@@ -16,7 +16,7 @@
##
##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+## $Rev$ $Date$
##
maven.compile.source=1.4
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/plugins/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/project.properties (original)
+++ geronimo/branches/1.0/plugins/project.properties Sun Dec 11 12:58:34 2005
@@ -13,7 +13,7 @@
# limitations under the License.
##
-## $Rev: 158645 $ $Date: 2005-03-22 11:39:44 -0800 (Tue, 22 Mar 2005) $
+## $Rev$ $Date$
##
Propchange: geronimo/branches/1.0/plugins/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/plugins/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/plugins/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/adventurebuilder/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/adventurebuilder/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/adventurebuilder/src/var/security/adventure1.0.1_groups.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/adventurebuilder/src/var/security/adventure1.0.1_users.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/contrib/iiop/corba_container.2.zip
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/zip
Propchange: geronimo/branches/1.0/sandbox/contrib/iiop/src.2.zip
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/zip
Propchange: geronimo/branches/1.0/sandbox/freeorb/geronimo-orb/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-"Author Date Id Revision"
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/freeorb/geronimo-orb/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/jcache-spec/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/sandbox/jcache-spec/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/jcache-spec/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/jcache-spec/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/sandbox/jcache-spec/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/jcache-spec/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/mail/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/mail/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/mail/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/mail/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/mail/README.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/mail/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/sandbox/petstore/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/sandbox/petstore/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev, Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/petstore/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/sandbox/petstore/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/sandbox/petstore/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/sandbox/petstore/project.properties (original)
+++ geronimo/branches/1.0/sandbox/petstore/project.properties Sun Dec 11 12:58:34 2005
@@ -1,20 +1,20 @@
-##
-##
-## Copyright 2005 The Apache Software Foundation
-##
-## Licensed 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.
-##
-
-##
-## $Rev: 151530 $ $Date$
-petstore.home=petstore1.4
+##
+##
+## Copyright 2005 The Apache Software Foundation
+##
+## Licensed 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.
+##
+
+##
+## $Rev$ $Date$
+petstore.home=petstore1.4
Propchange: geronimo/branches/1.0/sandbox/petstore/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/sandbox/petstore/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev, Date
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/petstore/project.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties (original)
+++ geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties Sun Dec 11 12:58:34 2005
@@ -1,18 +1,18 @@
-##
-##
-## Copyright 2004 The Apache Software Foundation
-##
-## Licensed 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.
-##
-
-admin=jps_admin,supplier
+##
+##
+## Copyright 2004 The Apache Software Foundation
+##
+## Licensed 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.
+##
+
+admin=jps_admin,supplier
Propchange: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_groups.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties (original)
+++ geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties Sun Dec 11 12:58:34 2005
@@ -1,19 +1,19 @@
-##
-##
-## Copyright 2004 The Apache Software Foundation
-##
-## Licensed 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.
-##
-
-supplier=supplier
-jps_admin=admin
+##
+##
+## Copyright 2004 The Apache Software Foundation
+##
+## Licensed 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.
+##
+
+supplier=supplier
+jps_admin=admin
Propchange: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/sandbox/petstore/src/var/security/petstore1.3.2_users.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/branches/1.0/xdocs/20031031_jboss.pdf
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/pdf
Propchange: geronimo/branches/1.0/xdocs/20041028_jbossresponse.pdf
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/pdf
Modified: geronimo/branches/1.0/xdocs/documentation.html
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/xdocs/documentation.html?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/xdocs/documentation.html (original)
+++ geronimo/branches/1.0/xdocs/documentation.html Sun Dec 11 12:58:34 2005
@@ -17,7 +17,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Rev: 47507 $ $Date: 2004-09-29 17:56:18 -0400 (Wed, 29 Sep 2004) $ -->
+<!-- $Rev$ $Date$ -->
<html>
<head>
Propchange: geronimo/branches/1.0/xdocs/documentation.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/branches/1.0/xdocs/documentation.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/xdocs/documentation.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: geronimo/branches/1.0/xdocs/download.html
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL
Propchange: geronimo/branches/1.0/xdocs/download.html
------------------------------------------------------------------------------
svn:mime-type = text/html