Author: seba.wagner
Date: Tue Oct  7 06:46:40 2008
New Revision: 1602

Added:
    trunk/webapp/lib/backup/commons-logging-1.1.jar   (props changed)
       - copied unchanged from r1529,  
/trunk/webapp/lib/axis2-1.3/commons-logging-1.1.jar
    trunk/webapp/lib/backup/log4j-1.2.14.jar   (props changed)
       - copied unchanged from r1529,  
/trunk/webapp/lib/axis2-1.3/log4j-1.2.14.jar
Removed:
    trunk/webapp/lib/axis2-1.3/commons-logging-1.1.jar
    trunk/webapp/lib/axis2-1.3/log4j-1.2.14.jar
Modified:
    trunk/webapp/.classpath
    trunk/webapp/build.xml
    trunk/webapp/filetest.keystore
    trunk/webapp/webapp/openmeetings/WEB-INF/web.xml

Log:
removed log4j and added axis2 again to build

Modified: trunk/webapp/.classpath
==============================================================================
--- trunk/webapp/.classpath     (original)
+++ trunk/webapp/.classpath     Tue Oct  7 06:46:40 2008
@@ -95,7 +95,6 @@
        <classpathentry kind="lib"  
path="lib/axis2-1.3/commons-fileupload-1.1.1.jar"/>
        <classpathentry kind="lib"  
path="lib/axis2-1.3/commons-httpclient-3.0.1.jar"/>
        <classpathentry kind="lib" path="lib/axis2-1.3/commons-io-1.2.jar"/>
-       <classpathentry kind="lib" 
path="lib/axis2-1.3/commons-logging-1.1.jar"/>
        <classpathentry kind="lib"  
path="lib/axis2-1.3/geronimo-annotation_1.0_spec-1.1.jar"/>
        <classpathentry kind="lib"  
path="lib/axis2-1.3/geronimo-jms_1.1_spec-1.1.jar"/>
        <classpathentry kind="lib" 
path="lib/axis2-1.3/httpcore-4.0-alpha5.jar"/>
@@ -109,7 +108,6 @@
        <classpathentry kind="lib" path="lib/axis2-1.3/jettison-1.0-RC1.jar"/>
        <classpathentry kind="lib" path="lib/axis2-1.3/jibx-run-1.1.5.jar"/>
        <classpathentry kind="lib" path="lib/axis2-1.3/juli-6.0.10.jar"/>
-       <classpathentry kind="lib" path="lib/axis2-1.3/log4j-1.2.14.jar"/>
        <classpathentry kind="lib" path="lib/axis2-1.3/mail-1.4.jar"/>
        <classpathentry kind="lib" path="lib/axis2-1.3/mex-impl-1.3.jar"/>
        <classpathentry kind="lib" path="lib/axis2-1.3/neethi-2.0.2.jar"/>

Modified: trunk/webapp/build.xml
==============================================================================
--- trunk/webapp/build.xml      (original)
+++ trunk/webapp/build.xml      Tue Oct  7 06:46:40 2008
@@ -200,10 +200,8 @@
                        </fileset>
                </copy> 
                <copy todir="${dist.dir}/openmeetings/WEB-INF/lib">
-                       <!--
                        <fileset dir="${axis2.lib}">
                        </fileset>
-                        -->
                        <!--
                        <fileset dir="${slf4j.lib}">
                        </fileset>

Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.

Modified: trunk/webapp/webapp/openmeetings/WEB-INF/web.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/WEB-INF/web.xml    (original)
+++ trunk/webapp/webapp/openmeetings/WEB-INF/web.xml    Tue Oct  7 06:46:40  
2008
@@ -100,7 +100,7 @@
          <servlet-name>Import</servlet-name>
           
<servlet-class>org.openmeetings.servlet.outputhandler.Import</servlet-class>
      </servlet>
-    <!-- Axis2 Settings
+    <!-- Axis2 Settings -->
      <servlet>
          <servlet-name>AxisServlet</servlet-name>
           
<servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
@@ -110,7 +110,7 @@
          <servlet-name>AxisAdminServlet</servlet-name>
           
<servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
      </servlet>
-     -->
+
      <servlet>
          <description>MethodGateway</description>
          <display-name>MethodGateway</display-name>
@@ -157,7 +157,7 @@
          <servlet-name>Import</servlet-name>
          <url-pattern>/Import</url-pattern>
      </servlet-mapping>
-    <!-- Axis2
+    <!-- Axis2 -->
      <servlet-mapping>
          <servlet-name>AxisServlet</servlet-name>
          <url-pattern>/servlet/AxisServlet</url-pattern>
@@ -174,7 +174,7 @@
          <servlet-name>AxisAdminServlet</servlet-name>
          <url-pattern>/axis2-admin/*</url-pattern>
      </servlet-mapping>
-     -->
+
      <servlet-mapping>
          <servlet-name>MethodGateway</servlet-name>
          <url-pattern>/MethodGateway</url-pattern>
@@ -183,7 +183,7 @@
          <extension>inc</extension>
          <mime-type>text/plain</mime-type>
      </mime-mapping>
-    <!-- Axis2
+    <!-- Axis2 -->
      <error-page>
          <error-code>404</error-code>
          <location>/axis2-web/Error/error404.jsp</location>
@@ -192,7 +192,7 @@
          <error-code>500</error-code>
          <location>/axis2-web/Error/error500.jsp</location>
      </error-page>
-     -->
+
      <security-constraint>
          <web-resource-collection>
              <web-resource-name>Forbidden</web-resource-name>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to