You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/08/09 16:57:57 UTC
cvs commit: jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal WarBuilder.java
vmassol 2003/08/09 07:57:57
Modified: integration/ant Tag: CACTUS_15_BRANCH
build.properties.sample
integration/eclipse/org.apache.cactus.eclipse.runner Tag:
CACTUS_15_BRANCH build.xml
integration/ant/src/confs/share/weblogic7x Tag:
CACTUS_15_BRANCH DefaultAuthenticatorInit.ldift
config.xml
integration/eclipse/org.apache.cactus.eclipse.webapp Tag:
CACTUS_15_BRANCH build.xml
integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal/ui
Tag: CACTUS_15_BRANCH WebAppConfigurationBlock.java
integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal
Tag: CACTUS_15_BRANCH WarBuilder.java
Removed: integration/ant/src/confs/share/weblogic7x/testserver/ldap/ldapfiles
Tag: CACTUS_15_BRANCH EmbeddedLDAP.trpos
EmbeddedLDAP.data EmbeddedLDAP.index
EmbeddedLDAP.delete EmbeddedLDAP.twpos
EmbeddedLDAP.tran
integration/ant/src/confs/share/weblogic7x Tag:
CACTUS_15_BRANCH SerializedSystemIni.dat
fileRealm.properties
Log:
Merged from HEAD
Revision Changes Path
No revision
No revision
1.17.2.1 +2 -2 jakarta-cactus/integration/ant/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/build.properties.sample,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- build.properties.sample 13 Jul 2003 14:26:00 -0000 1.17
+++ build.properties.sample 9 Aug 2003 14:57:56 -0000 1.17.2.1
@@ -34,7 +34,7 @@
log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.8.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar
+commons.httpclient.jar = ${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-rc1.jar
# The location of the AspectJ runtime jar
aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
No revision
No revision
1.29.2.1 +3 -2 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/build.xml,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -r1.29 -r1.29.2.1
--- build.xml 30 Jun 2003 16:22:10 -0000 1.29
+++ build.xml 9 Aug 2003 14:57:56 -0000 1.29.2.1
@@ -242,7 +242,8 @@
to 0.0.0 and replace that with the actual plugin version here -->
<copy todir="${dist.bin.dir}" file="${base.dir}/plugin.xml">
<filterset begintoken='"' endtoken='"'>
- <filter token='0.0.0' value='"${project.version.plugin}"'/>
+ <filter token='0.0.0'
+ value='"${project.version.major}.${project.version.minor}.${DSTAMP}"'/>
</filterset>
</copy>
No revision
No revision
1.1.4.1 +18 -6 jakarta-cactus/integration/ant/src/confs/share/weblogic7x/DefaultAuthenticatorInit.ldift
Index: DefaultAuthenticatorInit.ldift
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/confs/share/weblogic7x/DefaultAuthenticatorInit.ldift,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- DefaultAuthenticatorInit.ldift 3 Feb 2003 10:52:41 -0000 1.1
+++ DefaultAuthenticatorInit.ldift 9 Aug 2003 14:57:56 -0000 1.1.4.1
@@ -50,16 +50,28 @@
objectclass: organizationalUnit
objectclass: top
-dn: uid=system,ou=people,ou=@realm@, dc=@domain@
-description: system
+dn: uid=weblogic,ou=people,ou=@realm@, dc=@domain@
+description: weblogic
objectclass: inetOrgPerson
objectclass: organizationalPerson
objectclass: person
objectclass: top
-cn: system
-sn: system
-userpassword: {ssha}XYqqB9c/6OXoNVCOil7ZRdbb/GSIXVcE
-uid: system
+cn: weblogic
+sn: weblogic
+userpassword: weblogic
+uid: weblogic
objectclass: wlsUser
wlsMemberOf: cn=Administrators,ou=groups,ou=@realm@,dc=@domain@
+dn: uid=testuser,ou=people,ou=@realm@, dc=@domain@
+description: test user for Cactus
+objectclass: inetOrgPerson
+objectclass: organizationalPerson
+objectclass: person
+objectclass: top
+cn: testuser
+sn: testuser
+userpassword: testpassword
+uid: testuser
+objectclass: wlsUser
+wlsMemberOf: cn=Administrators,ou=groups,ou=@realm@,dc=@domain@
1.1.4.1 +0 -10 jakarta-cactus/integration/ant/src/confs/share/weblogic7x/config.xml
Index: config.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/confs/share/weblogic7x/config.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- config.xml 3 Feb 2003 10:52:41 -0000 1.1
+++ config.xml 9 Aug 2003 14:57:56 -0000 1.1.4.1
@@ -1,15 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Domain Name="testdomain">
- <EmbeddedLDAP
- Credential="{3DES}55B/7RZVVwwrYUjjEf9Cdd5f72Gj7pm7apl5R36oQfU=" Name="testdomain"/>
- <FileRealm Name="wl_default_file_realm"/>
- <PasswordPolicy Name="wl_default_password_policy"/>
- <Realm FileRealm="wl_default_file_realm" Name="wl_default_realm"/>
- <Security Name="testdomain"
- PasswordPolicy="wl_default_password_policy"
- Realm="wl_default_realm" RealmSetup="true"/>
- <SecurityConfiguration
- Credential="{3DES}VXIBKpJ4bKQa1IbvnNqcaZa6BPWIg0zhWlcSd2lrfZmn7KZ9gF7QnMZqhjswb/KzSbiBo/cuJGV7qLrkNbpL64iLduDXGin1" Name="testdomain"/>
<Server Name="testserver" NativeIOEnabled="true" ListenPort="@cactus.port@"/>
</Domain>
No revision
No revision
1.17.2.1 +3 -2 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- build.xml 14 Jul 2003 19:05:32 -0000 1.17
+++ build.xml 9 Aug 2003 14:57:57 -0000 1.17.2.1
@@ -179,7 +179,8 @@
0.0.0 and replace that with the actual plugin version here -->
<copy todir="${dist.bin.dir}" file="${base.dir}/plugin.xml">
<filterset begintoken='"' endtoken='"'>
- <filter token='0.0.0' value='"${project.version.plugin}"'/>
+ <filter token='0.0.0'
+ value='"${project.version.major}.${project.version.minor}.${DSTAMP}"'/>
</filterset>
</copy>
No revision
No revision
1.2.2.1 +3 -3 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal/ui/WebAppConfigurationBlock.java
Index: WebAppConfigurationBlock.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal/ui/WebAppConfigurationBlock.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- WebAppConfigurationBlock.java 11 Jun 2003 16:05:44 -0000 1.2
+++ WebAppConfigurationBlock.java 9 Aug 2003 14:57:57 -0000 1.2.2.1
@@ -200,7 +200,7 @@
* Possible use : validation of an entry in a dialog field.
* @param theField field that triggered an event.
*/
- private final void webappDialogFieldChanged(final DialogField theField)
+ private void webappDialogFieldChanged(final DialogField theField)
{
// TODO: validate entries in dialogs
// Do nothing.
@@ -210,7 +210,7 @@
* Adapter that dispatches events from StringButtonDialog fields.
* @param theField field that triggered an event.
*/
- private final void webappChangeControlPressed(final DialogField theField)
+ private void webappChangeControlPressed(final DialogField theField)
{
if (theField == outputField)
{
No revision
No revision
1.2.2.1 +3 -3 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal/WarBuilder.java
Index: WarBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/src/java/org/apache/cactus/eclipse/webapp/internal/WarBuilder.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- WarBuilder.java 11 Jun 2003 16:05:43 -0000 1.2
+++ WarBuilder.java 9 Aug 2003 14:57:57 -0000 1.2.2.1
@@ -204,7 +204,7 @@
* @throws JavaModelException if we fail to get the project relative
* output location
*/
- private static final File getAbsoluteOutputLocation(
+ private static File getAbsoluteOutputLocation(
final IJavaProject theJavaProject) throws JavaModelException
{
IPath projectPath = theJavaProject.getProject().getLocation();
@@ -305,7 +305,7 @@
* @param theJarEntries the jars to build ZipFileSets from
* @return an array of ZipFileSet corresponding to the given jars
*/
- private static final ZipFileSet[] getZipFileSets(
+ private static ZipFileSet[] getZipFileSets(
final IClasspathEntry[] theJarEntries)
{
Vector result = new Vector();