vmassol     2003/08/09 09:46:27

  Modified:    
integration/ant/src/java/org/apache/cactus/integration/ant/container/weblogic
                        Tag: CACTUS_15_BRANCH WebLogic7xContainer.java
               integration/ant/src/confs/share/weblogic7x Tag:
                        CACTUS_15_BRANCH config.xml
  Log:
  Merged from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.2   +2 -9      
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/weblogic/WebLogic7xContainer.java
  
  Index: WebLogic7xContainer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/weblogic/WebLogic7xContainer.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- WebLogic7xContainer.java  9 Aug 2003 14:52:16 -0000       1.5.2.1
  +++ WebLogic7xContainer.java  9 Aug 2003 16:46:27 -0000       1.5.2.2
  @@ -90,7 +90,7 @@
   
       /**
        * The WebLogic 7.x installation directory. For example:
  -     * "c:/bea/weblogic700".
  +     * "c:\bea\weblogic700".
        */
       private File dir;
   
  @@ -204,13 +204,6 @@
               
               File serverDir = new File(this.dir, "server");
               
  -            Path libraryPath = new Path(getProject());
  -            libraryPath.createPathElement().setPath(
  -                getProject().getProperty("java.library.path"));
  -            libraryPath.createPathElement().setLocation(
  -                new File(serverDir, "bin"));
  -            java.addSysproperty(
  -                createSysProperty("java.library.path", libraryPath));
               java.addSysproperty(
                   createSysProperty("weblogic.Name", "testserver"));
               java.addSysproperty(
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.2   +1 -1      
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.4.1
  retrieving revision 1.1.4.2
  diff -u -r1.1.4.1 -r1.1.4.2
  --- config.xml        9 Aug 2003 14:57:56 -0000       1.1.4.1
  +++ config.xml        9 Aug 2003 16:46:27 -0000       1.1.4.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <Domain Name="testdomain">
  -    <Server Name="testserver" NativeIOEnabled="true" ListenPort="@cactus.port@"/>
  +    <Server Name="testserver" ListenPort="@cactus.port@"/>
   </Domain>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to