Author: saminda
Date: Fri May 19 07:12:42 2006
New Revision: 407801
URL: http://svn.apache.org/viewvc?rev=407801&view=rev
Log:
checkin for asankha
Modified:
incubator/synapse/trunk/java/bin/web.xml
incubator/synapse/trunk/java/etc/project.properties
incubator/synapse/trunk/java/modules/core/maven.xml
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/SpringConfigExtensionFactory.java
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
incubator/synapse/trunk/java/modules/samples/scripts/userguide/README.txt
Modified: incubator/synapse/trunk/java/bin/web.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/bin/web.xml?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
--- incubator/synapse/trunk/java/bin/web.xml (original)
+++ incubator/synapse/trunk/java/bin/web.xml Fri May 19 07:12:42 2006
@@ -8,9 +8,36 @@
<servlet-name>AxisServlet</servlet-name>
<display-name>Apache-Axis Servlet</display-name>
<servlet-class>
- org.apache.axis2.transport.http.AxisServlet
- </servlet-class>
+ org.apache.axis2.transport.http.AxisServlet</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>AxisRESTServlet</servlet-name>
+ <display-name>Apache-Axis Servlet (REST)</display-name>
+ <servlet-class>
+ org.apache.axis2.transport.http.AxisRESTServlet</servlet-class>
+ </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>AxisRESTServlet</servlet-name>
+ <url-pattern>/rest/*</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
@@ -24,103 +51,27 @@
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listServices</url-pattern>
+ <url-pattern>/services/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listService</url-pattern>
+ <servlet-name>AxisAdminServlet</servlet-name>
+ <url-pattern>/axis2-admin/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listModules</url-pattern>
- </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>/axis2-web/index.jsp</welcome-file>
+ </welcome-file-list>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/globalModules</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listPhases</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/engagingglobally</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/engageToService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/adminlogin</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/viewGlobalHandlers</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/selectService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/viewServiceHandlers</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listoperation</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listOperations</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>/servicedit</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/removeService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/editServicepara</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/selectServiceParaEdit</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listServciceGroups</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/engageToServiceGroup</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/listContexts</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/logout</url-pattern>
- </servlet-mapping>
<error-page>
- <exception-type>
-
org.apache.axis2.transport.http.server.AdminAppException</exception-type>
- <location>/Error/AuthError.html</location>
+ <error-code>404</error-code>
+ <location>/axis2-web/Error/error404.jsp</location>
</error-page>
- <!--error-page>
- <exception-type>java.lang.Exception</exception-type>
- <location>/Error/GenError.html</location>
- </error-page-->
+ <error-page>
+ <error-code>500</error-code>
+ <location>/axis2-web/Error/error500.jsp</location>
+ </error-page>
+
+
</web-app>
Modified: incubator/synapse/trunk/java/etc/project.properties
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/etc/project.properties?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
--- incubator/synapse/trunk/java/etc/project.properties (original)
+++ incubator/synapse/trunk/java/etc/project.properties Fri May 19 07:12:42 2006
@@ -80,7 +80,7 @@
optional.includes=
maven.multiproject.includes=\
modules/core/project.xml,\
-#modules/mediators/project.xml,\
+modules/mediators/project.xml,\
modules/samples/project.xml,\
modules/extensions/project.xml,\
${optional.includes}
Modified: incubator/synapse/trunk/java/modules/core/maven.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/maven.xml?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/maven.xml (original)
+++ incubator/synapse/trunk/java/modules/core/maven.xml Fri May 19 07:12:42 2006
@@ -47,6 +47,11 @@
<mkdir dir="target/synapse-repository/modules"/>
<copy
file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository/modules/addressing-${addressing.version}.mar"/>
+ <copy todir="target/synapse-repository/conf">
+ <fileset dir="../../repository/conf">
+ <include name="**"/>
+ </fileset>
+ </copy>
<ant:delete dir="target/modules"/>
<ant:delete dir="target/services"/>
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/SpringConfigExtensionFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/SpringConfigExtensionFactory.java?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/SpringConfigExtensionFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/SpringConfigExtensionFactory.java
Fri May 19 07:12:42 2006
@@ -28,6 +28,8 @@
/**
* Creates a Spring configuration extension from XML configuration. A Spring
* configuration extension keeps Spring away from the core of synapse
+ *
+ * <spring:config name="string" src="file"/>
*/
public class SpringConfigExtensionFactory implements ExtensionFactory {
Modified:
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
Fri May 19 07:12:42 2006
@@ -16,8 +16,8 @@
package org.apache.synapse.mediators.deprecation;
-import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.api.Mediator;
import java.util.Map;
@@ -31,7 +31,7 @@
public DeprecationMediator() {
}
- public boolean mediate(SynapseMessage synapseMessageContext) {
+ public boolean mediate(MessageContext synapseMessageContext) {
try {
@@ -66,6 +66,10 @@
}
}
+ public String getType() {
+ return null;
+ }
+
private void loadConfiguration(Map mediatorConfig) {
configuration = new DeprecationConfiguration();
@@ -95,7 +99,7 @@
}
- public void setSynapseEnvironment(SynapseEnvironment se) {
+ public void setSynapseConfiguration(SynapseConfiguration se) {
//not used for now
}
Modified:
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
Fri May 19 07:12:42 2006
@@ -16,8 +16,9 @@
package org.apache.synapse.mediators.sla;
-import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.api.Mediator;
@@ -27,81 +28,84 @@
import java.io.InputStream;
public class SLAMediator implements Mediator {
- private ClassLoader classLoader;
- private SynapseEnvironment se;
+ private ClassLoader classLoader;
- private Log log = LogFactory.getLog(getClass());
+ private SynapseConfiguration synCfg;
- public SLAMediator() {
- }
-
- public boolean mediate(SynapseMessage synapseMessageContext) {
-
- try {
- log.info("SLA Mediator!");
- // MessageContext mc =
- //
((Axis2SynapseMessage)synapseMessageContext).getMessageContext();
- String resource = SLAConstants.CFG_XML_FOLDER + "/"
- + SLAConstants.CFG_SLA_XML;
- InputStream inStream =
classLoader.getResourceAsStream(resource);
- final SLAConfigurator slaConfigurator = new
SLAConfigurator(
- inStream);
- SLAStack slaStack = null;
- try {
- if (se.getProperty("PRIORITY_STACK") != null) {
- slaStack = (SLAStack)
se.getProperty("PRIORITY_STACK");
- } else {
- slaStack = new SLAStack();
- se.setProperty("PRIORITY_STACK",
slaStack);
- }
- } catch (Exception ex) {
- log.info(ex);
-
- }
- String fromAddress = (String)
synapseMessageContext.getFrom()
- .getAddress();
- int priority = slaConfigurator.getPriority(fromAddress,
- synapseMessageContext.getTo());
- SLAObject slaObject = new SLAObject(priority, System
- .currentTimeMillis(), fromAddress);
- try {
- slaStack.addRequest(slaObject);
- } catch (Exception ex) {
- log.info(ex);
- }
-
- while (true) {
- if (!slaStack.isEmpty()) {
- SLAObject slaObjectStack = (SLAObject)
slaStack.get(0);
- if (slaObjectStack.equals(slaObject)) {
- slaStack.remove(0);
- break;
- }
- } else {
- break;
- }
- }
-
- return true;
-
- } catch (Exception e) {
- log.info(e);
- return false;
- }
- }
-
- public void setSynapseEnvironment(SynapseEnvironment se) {
-
- this.se = se;
- if (se != null) {
- log.info("ENVIRONMENT NOT NULL IN SLA");
- }
- }
-
- public void setClassLoader(ClassLoader cl) {
- this.classLoader = cl;
- }
+ private Log log = LogFactory.getLog(getClass());
+ public SLAMediator() {
+ }
+ public boolean mediate(MessageContext synCtx) {
+
+ try {
+ log.info("SLA Mediator!");
+ // MessageContext mc =
+ //
((Axis2SynapseMessage)synapseMessageContext).getMessageContext();
+ String resource = SLAConstants.CFG_XML_FOLDER + "/"
+ + SLAConstants.CFG_SLA_XML;
+ InputStream inStream = classLoader.getResourceAsStream(resource);
+ final SLAConfigurator slaConfigurator = new SLAConfigurator(
+ inStream);
+ SLAStack slaStack = null;
+ try {
+ if (synCfg.getProperty("PRIORITY_STACK") != null) {
+ slaStack = (SLAStack) synCfg.getProperty("PRIORITY_STACK");
+ } else {
+ slaStack = new SLAStack();
+ synCfg.addProperty("PRIORITY_STACK", slaStack);
+ }
+ } catch (Exception ex) {
+ log.info(ex);
+
+ }
+ String fromAddress = (String) synCtx.getFrom()
+ .getAddress();
+ int priority = slaConfigurator.getPriority(fromAddress,
+ synCtx.getTo());
+ SLAObject slaObject = new SLAObject(priority, System
+ .currentTimeMillis(), fromAddress);
+ try {
+ slaStack.addRequest(slaObject);
+ } catch (Exception ex) {
+ log.info(ex);
+ }
+
+ while (true) {
+ if (!slaStack.isEmpty()) {
+ SLAObject slaObjectStack = (SLAObject) slaStack.get(0);
+ if (slaObjectStack.equals(slaObject)) {
+ slaStack.remove(0);
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+
+ return true;
+
+ } catch (Exception e) {
+ log.info(e);
+ return false;
+ }
+ }
+
+ public void setSynapseConfiguration(SynapseConfiguration se) {
+
+ this.synCfg = se;
+ if (se != null) {
+ log.info("ENVIRONMENT NOT NULL IN SLA");
+ }
+ }
+
+ public void setClassLoader(ClassLoader cl) {
+ this.classLoader = cl;
+ }
+
+ public String getType() {
+ return null;
+ }
}
Modified:
incubator/synapse/trunk/java/modules/samples/scripts/userguide/README.txt
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/samples/scripts/userguide/README.txt?rev=407801&r1=407800&r2=407801&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/scripts/userguide/README.txt
(original)
+++ incubator/synapse/trunk/java/modules/samples/scripts/userguide/README.txt
Fri May 19 07:12:42 2006
@@ -75,7 +75,8 @@
To start up this server, use the custom.bat or equivalent file.
To run the simple client to test this
configuration run the SimpleStockQuoteClient example from Ant.
The programatically created Synapse
configuration simply sends the messages coming into Synapse
using to thier implicit destinations.
- i.e. Using WS-A To address.
+ i.e. Using WS-A To address. This excercise will require you to
place the Spring.jar file into the <SYNAPSE>\lib
+ directory.
The test client can be started by ant simplequote
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
