Author: bodewig
Date: Sun Feb 5 08:40:02 2012
New Revision: 1240682
URL: http://svn.apache.org/viewvc?rev=1240682&view=rev
Log:
merge removal of starteam and weblogic references from trunk
Removed:
ant/core/branches/ANT_18_BRANCH/manual/Tasks/starteam.html
Modified:
ant/core/branches/ANT_18_BRANCH/ (props changed)
ant/core/branches/ANT_18_BRANCH/manual/Tasks/ejb.html
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/ExtensionPoint.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/filters/SuffixLines.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/defaults.properties
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/core/extension-point-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/core/ref-psyntax-hint-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/filters/suffix-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/dependset-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/exec/exec-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/exec/expected/utf-8
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/exec/input/iso8859-1
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/include-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/xslt/printParams-invalid.xsl
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/types/resources/comparators/test.xml
(props changed)
Propchange: ant/core/branches/ANT_18_BRANCH/
------------------------------------------------------------------------------
svn:mergeinfo = /ant/core/trunk:1240672-1240680
Modified: ant/core/branches/ANT_18_BRANCH/manual/Tasks/ejb.html
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/manual/Tasks/ejb.html?rev=1240682&r1=1240681&r2=1240682&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/manual/Tasks/ejb.html (original)
+++ ant/core/branches/ANT_18_BRANCH/manual/Tasks/ejb.html Sun Feb 5 08:40:02
2012
@@ -80,8 +80,6 @@ In general these tasks are specific to t
<table border="1" cellpadding="5">
<tr><td>Task</td><td colspan="2">Application Servers</td></tr>
<tr><td><a href="BorlandGenerateClient.html">blgenclient</a></td><td
colspan="2">Borland Application Server 4.5 and 5.x</td></tr>
- <tr><td><a href="#ddcreator">ddcreator</a></td><td colspan="2">Weblogic
4.5.1</td></tr>
- <tr><td><a href="#ejbc">ejbc</a></td><td colspan="2">Weblogic 4.5.1</td></tr>
<tr><td><a href="#iplanet-ejbc">iplanet-ejbc</a></td><td colspan="2">iPlanet
Application Server 6.0</td></tr>
<tr><td rowspan="7"><a href="#ejbjar">ejbjar</a></td><td colspan="2"
align="center"><b>Nested Elements</b></td></tr>
<tr><td><a href="BorlandEJBTasks.html">borland</a></td><td>Borland
Application Server 4.5 and 5.x</td></tr>
@@ -90,9 +88,7 @@ In general these tasks are specific to t
<tr><td><a href="#ejbjar_jonas">jonas</a></td><td>JOnAS 2.4.x and
2.5</td></tr>
<tr><td><a href="#ejbjar_weblogic">weblogic</a></td><td>Weblogic 5.1 to
7.0</td></tr>
<tr><td><a href="#ejbjar_websphere">websphere</a></td><td>IBM WebSphere
4.0</td></tr>
- <tr><td><a href="#wlrun">wlrun</a></td><td colspan="2">Weblogic 4.5.1 to
7.0</td></tr>
- <tr><td><a href="#wlstop">wlstop</a></td><td colspan="2">Weblogic 4.5.1 to
7.0</td></tr>
-
+
</table>
<hr>
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/ExtensionPoint.java
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/filters/SuffixLines.java
('svn:mergeinfo' removed)
Modified:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/defaults.properties
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/defaults.properties?rev=1240682&r1=1240681&r2=1240682&view=diff
==============================================================================
---
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/defaults.properties
(original)
+++
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Sun Feb 5 08:40:02 2012
@@ -140,9 +140,7 @@ ccunlock=org.apache.tools.ant.taskdefs.o
ccupdate=org.apache.tools.ant.taskdefs.optional.clearcase.CCUpdate
chgrp=org.apache.tools.ant.taskdefs.optional.unix.Chgrp
chown=org.apache.tools.ant.taskdefs.optional.unix.Chown
-ddcreator=org.apache.tools.ant.taskdefs.optional.ejb.DDCreator
depend=org.apache.tools.ant.taskdefs.optional.depend.Depend
-ejbc=org.apache.tools.ant.taskdefs.optional.ejb.Ejbc
ejbjar=org.apache.tools.ant.taskdefs.optional.ejb.EjbJar
ftp=org.apache.tools.ant.taskdefs.optional.net.FTP
image=org.apache.tools.ant.taskdefs.optional.image.Image
@@ -194,10 +192,6 @@ sound=org.apache.tools.ant.taskdefs.opti
splash=org.apache.tools.ant.taskdefs.optional.splash.SplashTask
sshexec=org.apache.tools.ant.taskdefs.optional.ssh.SSHExec
sshsession=org.apache.tools.ant.taskdefs.optional.ssh.SSHSession
-stcheckin=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckin
-stcheckout=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckout
-stlabel=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamLabel
-stlist=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamList
symlink=org.apache.tools.ant.taskdefs.optional.unix.Symlink
telnet=org.apache.tools.ant.taskdefs.optional.net.TelnetTask
translate=org.apache.tools.ant.taskdefs.optional.i18n.Translate
@@ -211,8 +205,6 @@ vssget=org.apache.tools.ant.taskdefs.opt
vsshistory=org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY
vsslabel=org.apache.tools.ant.taskdefs.optional.vss.MSVSSLABEL
wljspc=org.apache.tools.ant.taskdefs.optional.jsp.WLJspc
-wlrun=org.apache.tools.ant.taskdefs.optional.ejb.WLRun
-wlstop=org.apache.tools.ant.taskdefs.optional.ejb.WLStop
xmlvalidate=org.apache.tools.ant.taskdefs.optional.XMLValidateTask
@@ -228,5 +220,4 @@ jspc=org.apache.tools.ant.taskdefs.optio
mimemail=org.apache.tools.ant.taskdefs.optional.net.MimeMail
rename=org.apache.tools.ant.taskdefs.Rename
renameext=org.apache.tools.ant.taskdefs.optional.RenameExtensions
-starteam=org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut
style=org.apache.tools.ant.taskdefs.XSLTProcess
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1240680
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java:746933,748063,748133,748288,749342,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1240680
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1240680
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1240680
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java:746933,748063,748133,749342,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1240680
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java:746933,748063,748133,749342,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1240680
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1240680
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1240680
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:909456
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 08:40:02 2012
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1240680
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/core/extension-point-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/core/ref-psyntax-hint-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/filters/suffix-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/dependset-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/exec/exec-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/exec/expected/utf-8
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/exec/input/iso8859-1
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/include-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/xslt/printParams-invalid.xsl
('svn:mergeinfo' removed)
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/antunit/types/resources/comparators/test.xml
('svn:mergeinfo' removed)
