Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/classes/log4j.properties URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/classes/log4j.properties?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/classes/log4j.properties (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/classes/log4j.properties Tue Feb 17 22:06:18 2009 @@ -15,20 +15,20 @@ # limitations under the License. # -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=WARN, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=ERROR -log4j.category.org.hibernate.type=WARN -log4j.category.org.objectweb=ERROR +# Set root logger level to WARN and its only appender to CONSOLE +log4j.rootLogger=WARN, CONSOLE + +# log4j properties to work with commandline tools. +log4j.category.org.mortbay=ERROR +log4j.category.org.hibernate.type=WARN +log4j.category.org.objectweb=ERROR log4j.category.org.apache.ode.axis2=DEBUG -log4j.category.org.apache.ode.axis2.hooks.SessionInHandler=INFO -log4j.category.org.apache.ode.bpel.engine=DEBUG -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=DEBUG -log4j.category.org.apache.ode.bpel.epr=INFO - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n +log4j.category.org.apache.ode.axis2.hooks.SessionInHandler=INFO +log4j.category.org.apache.ode.bpel.engine=DEBUG +log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=DEBUG +log4j.category.org.apache.ode.bpel.epr=INFO + +# Console appender +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml Tue Feb 17 22:06:18 2009 @@ -135,22 +135,22 @@ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ) <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener"> - <parameter name="myTopicConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> + <parameter name="myTopicConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> </parameter> - <parameter name="myQueueConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="myQueueConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> - <parameter name="default" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="default" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> </transportReceiver>--> @@ -163,7 +163,7 @@ <!--<parameter name="transport.mail.replyToAddress" locked="false">[email protected]</parameter>--> <!--</transportReceiver>--> - <!--Uncomment if you want to have TCP transport support--> + <!--Uncomment if you want to have TCP transport support--> <!--transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer"> <parameter name="port" locked="false">6060</parameter-->> @@ -240,8 +240,8 @@ <handler name="HTTPLocationBasedDispatcher" class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> - <handler name="ODEAxisDispatcher" - class="org.apache.ode.axis2.hooks.ODEAxisDispatcher"> + <handler name="ODEAxisDispatcher" + class="org.apache.ode.axis2.hooks.ODEAxisDispatcher"> <order phase="Dispatch"/> </handler> </phase> @@ -254,17 +254,17 @@ </handler> </phase> <phase name="OperationInPhase"/> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> </phaseOrder> <phaseOrder type="OutFlow"> <!-- user can add his own phases to this area --> - <phase name="ProcessHeader"> - <handler name="SessionOutHandler" - class="org.apache.ode.axis2.hooks.SessionOutHandler"> - <order phase="PreDispatch"/> - </handler> - </phase> - <phase name="soapmonitorPhase"/> + <phase name="ProcessHeader"> + <handler name="SessionOutHandler" + class="org.apache.ode.axis2.hooks.SessionOutHandler"> + <order phase="PreDispatch"/> + </handler> + </phase> + <phase name="soapmonitorPhase"/> <phase name="OperationOutPhase"/> <!--system predefined phase--> <!--these phase will run irrespective of the service--> @@ -297,11 +297,11 @@ </phase> <!-- user can add his own phases to this area --> <phase name="OperationInFaultPhase"/> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> </phaseOrder> <phaseOrder type="OutFaultFlow"> <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> <phase name="OperationOutFaultPhase"/> <phase name="PolicyDetermination"/> <phase name="MessageOut"/> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml Tue Feb 17 22:06:18 2009 @@ -135,22 +135,22 @@ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ) <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener"> - <parameter name="myTopicConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> + <parameter name="myTopicConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> </parameter> - <parameter name="myQueueConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="myQueueConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> - <parameter name="default" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="default" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> </transportReceiver>--> @@ -163,7 +163,7 @@ <!--<parameter name="transport.mail.replyToAddress" locked="false">[email protected]</parameter>--> <!--</transportReceiver>--> - <!--Uncomment if you want to have TCP transport support--> + <!--Uncomment if you want to have TCP transport support--> <!--transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer"> <parameter name="port" locked="false">6060</parameter-->> @@ -240,8 +240,8 @@ <handler name="HTTPLocationBasedDispatcher" class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> - <handler name="ODEAxisDispatcher" - class="org.apache.ode.axis2.hooks.ODEAxisDispatcher"> + <handler name="ODEAxisDispatcher" + class="org.apache.ode.axis2.hooks.ODEAxisDispatcher"> <order phase="Dispatch"/> </handler> </phase> @@ -254,17 +254,17 @@ </handler> </phase> <phase name="OperationInPhase"/> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> </phaseOrder> <phaseOrder type="OutFlow"> <!-- user can add his own phases to this area --> - <phase name="ProcessHeader"> - <handler name="SessionOutHandler" - class="org.apache.ode.axis2.hooks.SessionOutHandler"> - <order phase="PreDispatch"/> - </handler> - </phase> - <phase name="soapmonitorPhase"/> + <phase name="ProcessHeader"> + <handler name="SessionOutHandler" + class="org.apache.ode.axis2.hooks.SessionOutHandler"> + <order phase="PreDispatch"/> + </handler> + </phase> + <phase name="soapmonitorPhase"/> <phase name="OperationOutPhase"/> <!--system predefined phase--> <!--these phase will run irrespective of the service--> @@ -297,11 +297,11 @@ </phase> <!-- user can add his own phases to this area --> <phase name="OperationInFaultPhase"/> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> </phaseOrder> <phaseOrder type="OutFaultFlow"> <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> <phase name="OperationOutFaultPhase"/> <phase name="PolicyDetermination"/> <phase name="MessageOut"/> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml Tue Feb 17 22:06:18 2009 @@ -135,22 +135,22 @@ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ) <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener"> - <parameter name="myTopicConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> + <parameter name="myTopicConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> </parameter> - <parameter name="myQueueConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="myQueueConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> - <parameter name="default" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="default" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> </transportReceiver>--> @@ -163,7 +163,7 @@ <!--<parameter name="transport.mail.replyToAddress" locked="false">[email protected]</parameter>--> <!--</transportReceiver>--> - <!--Uncomment if you want to have TCP transport support--> + <!--Uncomment if you want to have TCP transport support--> <!--transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer"> <parameter name="port" locked="false">6060</parameter-->> @@ -240,8 +240,8 @@ <handler name="HTTPLocationBasedDispatcher" class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> - <handler name="ODEAxisDispatcher" - class="org.apache.ode.axis2.hooks.ODEAxisDispatcher"> + <handler name="ODEAxisDispatcher" + class="org.apache.ode.axis2.hooks.ODEAxisDispatcher"> <order phase="Dispatch"/> </handler> </phase> @@ -254,17 +254,17 @@ </handler> </phase> <phase name="OperationInPhase"/> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> </phaseOrder> <phaseOrder type="OutFlow"> <!-- user can add his own phases to this area --> - <phase name="ProcessHeader"> - <handler name="SessionOutHandler" - class="org.apache.ode.axis2.hooks.SessionOutHandler"> - <order phase="PreDispatch"/> - </handler> - </phase> - <phase name="soapmonitorPhase"/> + <phase name="ProcessHeader"> + <handler name="SessionOutHandler" + class="org.apache.ode.axis2.hooks.SessionOutHandler"> + <order phase="PreDispatch"/> + </handler> + </phase> + <phase name="soapmonitorPhase"/> <phase name="OperationOutPhase"/> <!--system predefined phase--> <!--these phase will run irrespective of the service--> @@ -297,11 +297,11 @@ </phase> <!-- user can add his own phases to this area --> <phase name="OperationInFaultPhase"/> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> </phaseOrder> <phaseOrder type="OutFaultFlow"> <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase"/> + <phase name="soapmonitorPhase"/> <phase name="OperationOutFaultPhase"/> <phase name="PolicyDetermination"/> <phase name="MessageOut"/> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml Tue Feb 17 22:06:18 2009 @@ -134,22 +134,22 @@ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ) <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener"> - <parameter name="myTopicConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> + <parameter name="myTopicConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter> </parameter> - <parameter name="myQueueConnectionFactory" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="myQueueConnectionFactory" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> - <parameter name="default" locked="false"> - <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> + <parameter name="default" locked="false"> + <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> + <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> + <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter> </parameter> </transportReceiver>--> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/web.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/web.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/web.xml Tue Feb 17 22:06:18 2009 @@ -1,102 +1,102 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you 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. - --> - -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";> - -<web-app> - <display-name>Apache-Axis2</display-name> - <servlet> - <servlet-name>AxisServlet</servlet-name> - <display-name>Apache-Axis Servlet</display-name> - <servlet-class> - org.apache.ode.axis2.hooks.ODEAxisServlet</servlet-class> - <!--<init-param>--> - <!--<param-name>axis2.xml.path</param-name>--> - <!--<param-value>/WEB-INF/conf/axis2.xml</param-value>--> - <!--<param-name>axis2.xml.url</param-name>--> - <!--<param-value>http://localhot/myrepo/axis2.xml</param-value>--> - <!--<param-name>axis2.repository.path</param-name>--> - <!--<param-value>/WEB-INF</param-value>--> - <!--<param-name>axis2.repository.url</param-name>--> - <!--<param-value>http://localhot/myrepo</param-value>--> - <!--</init-param>--> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet> - <servlet-name>AxisAdminServlet</servlet-name> - <display-name>Apache-Axis AxisAdmin Servlet (REST)</display-name> - <servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/servlet/AxisServlet</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>*.jws</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/processes/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/deployment/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisAdminServlet</servlet-name> - <url-pattern>/axis2-admin/*</url-pattern> - </servlet-mapping> - - <welcome-file-list> - <welcome-file>/index.html</welcome-file> - </welcome-file-list> - - <error-page> - <error-code>404</error-code> - <location>/axis2-web/Error/error404.jsp</location> - </error-page> - - <error-page> - <error-code>500</error-code> - <location>/axis2-web/Error/error500.jsp</location> - </error-page> - - <!-- UNCOMMENT TO USE APPSERVER DATASOURCE - <resource-ref> - <res-ref-name>jdbc/ode-ds</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - <res-sharing-scope>Shareable</res-sharing-scope> - </resource-ref> - UNCOMMENT TO USE APPSERVER DATASOURCE --> - -</web-app> +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you 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. + --> + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";> + +<web-app> + <display-name>Apache-Axis2</display-name> + <servlet> + <servlet-name>AxisServlet</servlet-name> + <display-name>Apache-Axis Servlet</display-name> + <servlet-class> + org.apache.ode.axis2.hooks.ODEAxisServlet</servlet-class> + <!--<init-param>--> + <!--<param-name>axis2.xml.path</param-name>--> + <!--<param-value>/WEB-INF/conf/axis2.xml</param-value>--> + <!--<param-name>axis2.xml.url</param-name>--> + <!--<param-value>http://localhot/myrepo/axis2.xml</param-value>--> + <!--<param-name>axis2.repository.path</param-name>--> + <!--<param-value>/WEB-INF</param-value>--> + <!--<param-name>axis2.repository.url</param-name>--> + <!--<param-value>http://localhot/myrepo</param-value>--> + <!--</init-param>--> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>AxisAdminServlet</servlet-name> + <display-name>Apache-Axis AxisAdmin Servlet (REST)</display-name> + <servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>/servlet/AxisServlet</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>*.jws</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>/processes/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>/deployment/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisAdminServlet</servlet-name> + <url-pattern>/axis2-admin/*</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file>/index.html</welcome-file> + </welcome-file-list> + + <error-page> + <error-code>404</error-code> + <location>/axis2-web/Error/error404.jsp</location> + </error-page> + + <error-page> + <error-code>500</error-code> + <location>/axis2-web/Error/error500.jsp</location> + </error-page> + + <!-- UNCOMMENT TO USE APPSERVER DATASOURCE + <resource-ref> + <res-ref-name>jdbc/ode-ds</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> + UNCOMMENT TO USE APPSERVER DATASOURCE --> + +</web-app> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/SyntaxHighlighter.css URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/SyntaxHighlighter.css?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/SyntaxHighlighter.css (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/SyntaxHighlighter.css Tue Feb 17 22:06:18 2009 @@ -1,185 +1,185 @@ -.dp-highlighter -{ - font-family: "Consolas", "Courier New", Courier, mono, serif; - font-size: 12px; - background-color: #E7E5DC; - width: 99%; - overflow: auto; - margin: 18px 0 18px 0 !important; - padding-top: 1px; /* adds a little border on top when controls are hidden */ -} - -/* clear styles */ -.dp-highlighter ol, -.dp-highlighter ol li, -.dp-highlighter ol li span -{ - margin: 0; - padding: 0; - border: none; -} - -.dp-highlighter a, -.dp-highlighter a:hover -{ - background: none; - border: none; - padding: 0; - margin: 0; -} - -.dp-highlighter .bar -{ - padding-left: 45px; -} - -.dp-highlighter.collapsed .bar, -.dp-highlighter.nogutter .bar -{ - padding-left: 0px; -} - -.dp-highlighter ol -{ - list-style: decimal; /* for ie */ - background-color: #fff; - margin: 0px 0px 1px 45px !important; /* 1px bottom margin seems to fix occasional Firefox scrolling */ - padding: 0px; - color: #5C5C5C; -} - -.dp-highlighter.nogutter ol, -.dp-highlighter.nogutter ol li -{ - list-style: none !important; - margin-left: 0px !important; -} - -.dp-highlighter ol li, -.dp-highlighter .columns div -{ - list-style: decimal-leading-zero; /* better look for others, override cascade from OL */ - list-style-position: outside !important; - border-left: 3px solid #6CE26C; - background-color: #F8F8F8; - color: #5C5C5C; - padding: 0 3px 0 10px !important; - margin: 0 !important; - line-height: 14px; -} - -.dp-highlighter.nogutter ol li, -.dp-highlighter.nogutter .columns div -{ - border: 0; -} - -.dp-highlighter .columns -{ - background-color: #F8F8F8; - color: gray; - overflow: hidden; - width: 100%; -} - -.dp-highlighter .columns div -{ - padding-bottom: 5px; -} - -.dp-highlighter ol li.alt -{ - background-color: #FFF; - color: inherit; -} - -.dp-highlighter ol li span -{ - color: black; - background-color: inherit; -} - -/* Adjust some properties when collapsed */ - -.dp-highlighter.collapsed ol -{ - margin: 0px; -} - -.dp-highlighter.collapsed ol li -{ - display: none; -} - -/* Additional modifications when in print-view */ - -.dp-highlighter.printing -{ - border: none; -} - -.dp-highlighter.printing .tools -{ - display: none !important; -} - -.dp-highlighter.printing li -{ - display: list-item !important; -} - -/* Styles for the tools */ - -.dp-highlighter .tools -{ - padding: 3px 8px 3px 10px; - font: 9px Verdana, Geneva, Arial, Helvetica, sans-serif; - color: silver; - background-color: #f8f8f8; - padding-bottom: 10px; - border-left: 3px solid #6CE26C; -} - -.dp-highlighter.nogutter .tools -{ - border-left: 0; -} - -.dp-highlighter.collapsed .tools -{ - border-bottom: 0; -} - -.dp-highlighter .tools a -{ - font-size: 9px; - color: #a0a0a0; - background-color: inherit; - text-decoration: none; - margin-right: 10px; -} - -.dp-highlighter .tools a:hover -{ - color: red; - background-color: inherit; - text-decoration: underline; -} - -/* About dialog styles */ - -.dp-about { background-color: #fff; color: #333; margin: 0px; padding: 0px; } -.dp-about table { width: 100%; height: 100%; font-size: 11px; font-family: Tahoma, Verdana, Arial, sans-serif !important; } -.dp-about td { padding: 10px; vertical-align: top; } -.dp-about .copy { border-bottom: 1px solid #ACA899; height: 95%; } -.dp-about .title { color: red; background-color: inherit; font-weight: bold; } -.dp-about .para { margin: 0 0 4px 0; } -.dp-about .footer { background-color: #ECEADB; color: #333; border-top: 1px solid #fff; text-align: right; } -.dp-about .close { font-size: 11px; font-family: Tahoma, Verdana, Arial, sans-serif !important; background-color: #ECEADB; color: #333; width: 60px; height: 22px; } - -/* Language specific styles */ - -.dp-highlighter .comment, .dp-highlighter .comments { color: #008200; background-color: inherit; } -.dp-highlighter .string { color: blue; background-color: inherit; } -.dp-highlighter .keyword { color: #069; font-weight: bold; background-color: inherit; } -.dp-highlighter .preprocessor { color: gray; background-color: inherit; } +.dp-highlighter +{ + font-family: "Consolas", "Courier New", Courier, mono, serif; + font-size: 12px; + background-color: #E7E5DC; + width: 99%; + overflow: auto; + margin: 18px 0 18px 0 !important; + padding-top: 1px; /* adds a little border on top when controls are hidden */ +} + +/* clear styles */ +.dp-highlighter ol, +.dp-highlighter ol li, +.dp-highlighter ol li span +{ + margin: 0; + padding: 0; + border: none; +} + +.dp-highlighter a, +.dp-highlighter a:hover +{ + background: none; + border: none; + padding: 0; + margin: 0; +} + +.dp-highlighter .bar +{ + padding-left: 45px; +} + +.dp-highlighter.collapsed .bar, +.dp-highlighter.nogutter .bar +{ + padding-left: 0px; +} + +.dp-highlighter ol +{ + list-style: decimal; /* for ie */ + background-color: #fff; + margin: 0px 0px 1px 45px !important; /* 1px bottom margin seems to fix occasional Firefox scrolling */ + padding: 0px; + color: #5C5C5C; +} + +.dp-highlighter.nogutter ol, +.dp-highlighter.nogutter ol li +{ + list-style: none !important; + margin-left: 0px !important; +} + +.dp-highlighter ol li, +.dp-highlighter .columns div +{ + list-style: decimal-leading-zero; /* better look for others, override cascade from OL */ + list-style-position: outside !important; + border-left: 3px solid #6CE26C; + background-color: #F8F8F8; + color: #5C5C5C; + padding: 0 3px 0 10px !important; + margin: 0 !important; + line-height: 14px; +} + +.dp-highlighter.nogutter ol li, +.dp-highlighter.nogutter .columns div +{ + border: 0; +} + +.dp-highlighter .columns +{ + background-color: #F8F8F8; + color: gray; + overflow: hidden; + width: 100%; +} + +.dp-highlighter .columns div +{ + padding-bottom: 5px; +} + +.dp-highlighter ol li.alt +{ + background-color: #FFF; + color: inherit; +} + +.dp-highlighter ol li span +{ + color: black; + background-color: inherit; +} + +/* Adjust some properties when collapsed */ + +.dp-highlighter.collapsed ol +{ + margin: 0px; +} + +.dp-highlighter.collapsed ol li +{ + display: none; +} + +/* Additional modifications when in print-view */ + +.dp-highlighter.printing +{ + border: none; +} + +.dp-highlighter.printing .tools +{ + display: none !important; +} + +.dp-highlighter.printing li +{ + display: list-item !important; +} + +/* Styles for the tools */ + +.dp-highlighter .tools +{ + padding: 3px 8px 3px 10px; + font: 9px Verdana, Geneva, Arial, Helvetica, sans-serif; + color: silver; + background-color: #f8f8f8; + padding-bottom: 10px; + border-left: 3px solid #6CE26C; +} + +.dp-highlighter.nogutter .tools +{ + border-left: 0; +} + +.dp-highlighter.collapsed .tools +{ + border-bottom: 0; +} + +.dp-highlighter .tools a +{ + font-size: 9px; + color: #a0a0a0; + background-color: inherit; + text-decoration: none; + margin-right: 10px; +} + +.dp-highlighter .tools a:hover +{ + color: red; + background-color: inherit; + text-decoration: underline; +} + +/* About dialog styles */ + +.dp-about { background-color: #fff; color: #333; margin: 0px; padding: 0px; } +.dp-about table { width: 100%; height: 100%; font-size: 11px; font-family: Tahoma, Verdana, Arial, sans-serif !important; } +.dp-about td { padding: 10px; vertical-align: top; } +.dp-about .copy { border-bottom: 1px solid #ACA899; height: 95%; } +.dp-about .title { color: red; background-color: inherit; font-weight: bold; } +.dp-about .para { margin: 0 0 4px 0; } +.dp-about .footer { background-color: #ECEADB; color: #333; border-top: 1px solid #fff; text-align: right; } +.dp-about .close { font-size: 11px; font-family: Tahoma, Verdana, Arial, sans-serif !important; background-color: #ECEADB; color: #333; width: 60px; height: 22px; } + +/* Language specific styles */ + +.dp-highlighter .comment, .dp-highlighter .comments { color: #008200; background-color: inherit; } +.dp-highlighter .string { color: blue; background-color: inherit; } +.dp-highlighter .keyword { color: #069; font-weight: bold; background-color: inherit; } +.dp-highlighter .preprocessor { color: gray; background-color: inherit; } Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/global.css URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/global.css?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/global.css (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/global.css Tue Feb 17 22:06:18 2009 @@ -19,9 +19,9 @@ [Global Stylesheet] Version: 1.0 -Last change: 05/06/2008 -Assigned to: Apache Software Foundation -Primary use: ODE Management Console +Last change: 05/06/2008 +Assigned to: Apache Software Foundation +Primary use: ODE Management Console -------------------------------------------------------------------*/ /** @@ -76,7 +76,7 @@ } /*------------------------------------- - SiteNav + SiteNav ---------------------------------------*/ #siteNav ul { @@ -171,7 +171,7 @@ #siteNav li.current a:link, #siteNav li.current a:visited { background: #f0f5f8 url( ../images/tab-selected-mid.png ) bottom left repeat-x; - color: #37454e; /*border-bottom: 1px solid #d7e5ed;*/ + color: #37454e; /*border-bottom: 1px solid #d7e5ed;*/ } #siteNav li ul, #siteNav li.current ul { Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/reset.css URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/reset.css?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/reset.css (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/reset.css Tue Feb 17 22:06:18 2009 @@ -19,9 +19,9 @@ [Reset Stylesheet] Version: 1.0 -Last change: 05/06/2008 -Assigned to: Apache Software Foundation -Primary use: ODE Management Console +Last change: 05/06/2008 +Assigned to: Apache Software Foundation +Primary use: ODE Management Console -------------------------------------------------------------------*/ p, div, h1, h2, h3, h4, ul, li, form, input, select, option { Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/style.css URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/style.css?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/style.css (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/css/style.css Tue Feb 17 22:06:18 2009 @@ -19,9 +19,9 @@ [Master Stylesheet] Version: 1.0 -Last change: 05/06/2008 -Assigned to: Apache Software Foundation -Primary use: ODE Management Console +Last change: 05/06/2008 +Assigned to: Apache Software Foundation +Primary use: ODE Management Console -------------------------------------------------------------------*/ @import "reset.css"; @import "global.css"; Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/deployment.html URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/deployment.html?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/deployment.html (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/deployment.html Tue Feb 17 22:06:18 2009 @@ -23,7 +23,7 @@ <script type="text/javascript" src="js/yui/container.js"></script> <script type="text/javascript" src="js/yui/button.js"> </script> - <script type="text/javascript" src="js/yui/animation.js"> + <script type="text/javascript" src="js/yui/animation.js"> </script> <script type="text/javascript" src="js/bubbling/bubbling.js"> </script> @@ -34,12 +34,12 @@ <script type="text/javascript" src="js/yui/tabview.js"> </script> <script type="text/javascript"> - + function init(){ - org.apache.ode.DeploymentHandling.populateDeployedPacks(); - setInterval('org.apache.ode.DeploymentHandling.populateDeployedPacks()', 15000); - var myTabs = new YAHOO.widget.TabView("tabt"); - } + org.apache.ode.DeploymentHandling.populateDeployedPacks(); + setInterval('org.apache.ode.DeploymentHandling.populateDeployedPacks()', 15000); + var myTabs = new YAHOO.widget.TabView("tabt"); + } YAHOO.util.Event.onDOMReady(init); </script> @@ -75,10 +75,10 @@ padding: 5px 10px 5px 0px; line-height: 20px; } - - .depn, .createn{ - margin-top:30px; - } + + .depn, .createn{ + margin-top:30px; + } </style> </head> <body> @@ -111,30 +111,30 @@ <dir id="insideW"> <div id="insideL"> <div id="content" class="yui-skin-sam"> - + <h2>Deployed Packages</h2> - <div id="deployed" class="yui-skin-sam"> - - </div> - + <div id="deployed" class="yui-skin-sam"> + + </div> + <h2 class="depn">Deploy New Process</h2> <script type="text/javascript"> // Removes leading whitespaces function LTrim( value ) { - var re = /\s*((\S+\s*)*)/; - return value.replace(re, "$1"); + var re = /\s*((\S+\s*)*)/; + return value.replace(re, "$1"); } // Removes ending whitespaces function RTrim( value ) { - var re = /((\s*\S+)*)\s*/; - return value.replace(re, "$1"); + var re = /((\s*\S+)*)\s*/; + return value.replace(re, "$1"); } // Removes leading and ending whitespaces function trim( value ) { return LTrim(RTrim(value)); - } + } function clearOpstat(){ var opStatDiv = document.getElementById('opstat'); @@ -187,11 +187,11 @@ </table> <br> <input type="button" id="doUpload" name="doUpload" value="OK" onclick="submitFormAsync('formdep');" /> - + </form> <div id="opstat" onload="clearOpstat();"> </div> - <div> + <div> <script type="text/javascript"> CodePress.run(); </script> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/fileupload.jsp URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/fileupload.jsp?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/fileupload.jsp (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/fileupload.jsp Tue Feb 17 22:06:18 2009 @@ -39,24 +39,24 @@ boolean isMultipart = ServletFileUpload.isMultipartContent(request); if (!isMultipart) { } else { - FileItemFactory factory = new DiskFileItemFactory(); - ServletFileUpload upload = new ServletFileUpload(factory); + FileItemFactory factory = new DiskFileItemFactory(); + ServletFileUpload upload = new ServletFileUpload(factory); List items = null; String packageName = null; - try { - items = upload.parseRequest(request); - } catch (FileUploadException e) { - e.printStackTrace(); - } - Iterator itr = items.iterator(); - while (itr.hasNext()) { - FileItem item = (FileItem) itr.next(); + try { + items = upload.parseRequest(request); + } catch (FileUploadException e) { + e.printStackTrace(); + } + Iterator itr = items.iterator(); + while (itr.hasNext()) { + FileItem item = (FileItem) itr.next(); if (item.isFormField()) { if(item.getFieldName().equals("fileName")){ packageName = item.getString(); } - } else { - try { + } else { + try { String itemName = item.getName(); String extension = itemName.toLowerCase(); if(extension.endsWith(".zip")){ @@ -127,9 +127,9 @@ } catch (Exception e) { out.println(e); out.println("Exception occuured while processing the file upload request!"); - } - } - } + } + } + } } %> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/index.html URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/index.html?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/index.html (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/index.html Tue Feb 17 22:06:18 2009 @@ -8,35 +8,35 @@ </script> <script type="text/javascript" src="js/ProcessManagementAPI.js"> </script> - <script type="text/javascript" src="js/yui/utilities.js"> + <script type="text/javascript" src="js/yui/utilities.js"> </script> - <script type="text/javascript" src="js/yui/button.js"></script> - <script type="text/javascript" src="js/yui/container.js"></script> + <script type="text/javascript" src="js/yui/button.js"></script> + <script type="text/javascript" src="js/yui/container.js"></script> <script type="text/javascript" src="js/bubbling/bubbling.js"> </script> <script type="text/javascript" src="js/bubbling/accordion.js"> </script> - <script type="text/javascript" src="js/yui/tabview.js"> + <script type="text/javascript" src="js/yui/tabview.js"> </script> - <script type="text/javascript" src="js/yui/animation.js"> + <script type="text/javascript" src="js/yui/animation.js"> </script> - <script type="text/javascript" src="js/yui/json-min.js"> + <script type="text/javascript" src="js/yui/json-min.js"> </script> - <script type="text/javascript" src="js/yui/datasource-beta-min.js"> + <script type="text/javascript" src="js/yui/datasource-beta-min.js"> </script> - <script type="text/javascript" src="js/yui/charts-experimental-min.js"> + <script type="text/javascript" src="js/yui/charts-experimental-min.js"> </script> - + <script type="text/javascript" src="js/ODE.js"> </script> <script type="text/javascript"> YAHOO.widget.Chart.SWFURL = "js/yui/charts.swf"; function populateStats(){ var stat = org.apache.ode.ProcessHandling.stats(); - var html = '<table><tr><td class="bl">Total Number of Processes in the System: </td><td>'+ - stat.numOfProcesses+ '</td><td class="bl">Total Number of Instances in the System:</td><td>'+ - stat.totalInst+ '</td></tr></table>'; - + var html = '<table><tr><td class="bl">Total Number of Processes in the System: </td><td>'+ + stat.numOfProcesses+ '</td><td class="bl">Total Number of Instances in the System:</td><td>'+ + stat.totalInst+ '</td></tr></table>'; + var statEle = document.getElementById('summary_tb'); statEle.innerHTML = html; var chart_data = @@ -54,25 +54,25 @@ var chartPie = new YAHOO.widget.PieChart("summary_chart", ds, { dataField: "count", - categoryField: "instances", - style: - { - padding: 10, - legend: - { - display: "right", - padding: 10, - spacing: 5, - font: - { - family: "Arial", - size: 13 - } - } + categoryField: "instances", + style: + { + padding: 10, + legend: + { + display: "right", + padding: 10, + spacing: 5, + font: + { + family: "Arial", + size: 13 + } + } } }); } - + function init(){ populateStats(); setInterval("populateStats()", 10000); @@ -129,28 +129,28 @@ height:250px; float:left; } - .sub_h{ - font-family:Georgia; - border-top:#0099FF solid 1px; - border-bottom:#0099FF solid 1px; - line-height:25px; - font-style:normal; - font-weight:normal; - color: #006699; - } - #summary_tb{ - text-align:left; - font-family:Georgia; - font-style:normal; - font-weight:normal; - font-size:1.5em; - } - .bl{ - color:#000; - } + .sub_h{ + font-family:Georgia; + border-top:#0099FF solid 1px; + border-bottom:#0099FF solid 1px; + line-height:25px; + font-style:normal; + font-weight:normal; + color: #006699; + } + #summary_tb{ + text-align:left; + font-family:Georgia; + font-style:normal; + font-weight:normal; + font-size:1.5em; + } + .bl{ + color:#000; + } </style> - <script type="text/javascript"> - </script> + <script type="text/javascript"> + </script> </head> <body> <div id="header"> @@ -212,8 +212,8 @@ </table> </div> </div> - <div id="events"> - </div> + <div id="events"> + </div> </div> </div> </dir> Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/instances.html URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/instances.html?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/instances.html (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/instances.html Tue Feb 17 22:06:18 2009 @@ -18,7 +18,7 @@ <script type="text/javascript" src="js/yui/button.js"></script> <script type="text/javascript" src="js/yui/button.js"> </script> - <script type="text/javascript" src="js/yui/animation.js"> + <script type="text/javascript" src="js/yui/animation.js"> </script> <script type="text/javascript" src="js/bubbling/bubbling.js"> </script> @@ -28,7 +28,7 @@ </script> <script type="text/javascript"> function init(){ - org.apache.ode.InstanceHandling.populateContent(); + org.apache.ode.InstanceHandling.populateContent(); setInterval('org.apache.ode.InstanceHandling.populateContent()', 15000); } Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/DeploymentService.js URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/DeploymentService.js?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/DeploymentService.js (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/DeploymentService.js Tue Feb 17 22:06:18 2009 @@ -17,9 +17,9 @@ var baseURL; if (location.host.indexOf('/') == -1 && location.protocol.indexOf('/') == -1) { - baseURL = location.protocol + "//" + location.host + "/"; + baseURL = location.protocol + "//" + location.host + "/"; }else if(location.host.indexOf('/') != -1 && location.protocol.indexOf('/') == -1){ - baseURL = location.protocol + "//" + location.host; + baseURL = location.protocol + "//" + location.host; } var address = baseURL + "ode/processes/DeploymentService"; @@ -400,7 +400,7 @@ } return resultXML; } - } + } } WebService.visible = false; Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/InstanceManagementAPI.js URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/InstanceManagementAPI.js?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/InstanceManagementAPI.js (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/js/InstanceManagementAPI.js Tue Feb 17 22:06:18 2009 @@ -16,9 +16,9 @@ */ var baseURL; if (location.host.indexOf('/') == -1 && location.protocol.indexOf('/') == -1) { - baseURL = location.protocol + "//" + location.host + "/"; + baseURL = location.protocol + "//" + location.host + "/"; }else if(location.host.indexOf('/') != -1 && location.protocol.indexOf('/') == -1){ - baseURL = location.protocol + "//" + location.host; + baseURL = location.protocol + "//" + location.host; } var address = baseURL + "ode/processes/InstanceManagement";
