Author: jsong
Date: Mon Nov 22 16:45:10 2004
New Revision: 106252

Added:
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/server-config.wsdd
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/InstantiateControls.jws
   incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws
Modified:
   incubator/beehive/trunk/controls/test/webapps/build.xml
   incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml
   incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties
Log:
Add "-inject.wsm" into webapp/build.xml to run jws in controlsWeb.


Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/build.xml?view=diff&rev=106252&p1=incubator/beehive/trunk/controls/test/webapps/build.xml&r1=106251&p2=incubator/beehive/trunk/controls/test/webapps/build.xml&r2=106252
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml     (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml     Mon Nov 22 
16:45:10 2004
@@ -57,6 +57,9 @@
         <condition property="do.inject.netui">
            <istrue value="${app.inject.netui}"/>
         </condition>
+        <condition property="do.inject.wsm">
+           <istrue value="${app.inject.wsm}"/>
+        </condition>      
         <condition property="do.inject.milton">
            <istrue value="${app.inject.milton}"/>
         </condition>
@@ -103,6 +106,7 @@
         </copy>
 
         <antcall target="-inject.netui"/>
+        <antcall target="-inject.wsm"/>
         <antcall target="-inject.milton"/>
         <antcall target="-inject.derby"/>
         <antcall target="-inject.dbControl"/>        
@@ -130,6 +134,17 @@
         <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
               tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
               overwrite="true" failonerror="false"/>
+    </target>
+
+    <target name="-inject.wsm" if="do.inject.wsm">
+        <echo message="Injecting WSM in ${webapp.name}"/>
+        <ant antfile="${buildWebapp.ant}" target="deploy.wsm.webapp.runtime" 
inheritAll="false">
+           <property name="webapp.dir" value="${webapp.dir}" />
+        </ant>
+
+        <!--copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
+              tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
+              overwrite="true" failonerror="false"/-->
     </target>
 
     <target name="-inject.milton" if="do.inject.milton">

Added: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/server-config.wsdd
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/server-config.wsdd?view=auto&rev=106252
==============================================================================
--- (empty file)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/server-config.wsdd
        Mon Nov 22 16:45:10 2004
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="http://xml.apache.org/axis/wsdd/"; 
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+ <globalConfiguration>
+  <parameter name="adminPassword" value="admin"/>
+  <parameter name="disablePrettyXML" value="true"/>
+  <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
+  <parameter name="sendXsiTypes" value="true"/>
+  <!--<parameter name="sendMultiRefs" value="true"/>-->
+  <parameter name="sendXMLDeclaration" value="true"/>
+  <requestFlow>
+  <handler 
type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler">
+    <parameter name="scope" value="session"/>
+   </handler>
+      <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler">
+    <parameter name="scope" value="session"/>
+   </handler>
+  <handler type="java:org.apache.axis.handlers.JWSHandler">
+    <parameter name="scope" value="session"/>
+   </handler>
+    <!--<handler type="java:org.apache.axis.handlers.JWSHandler">
+    <parameter name="scope" value="request"/>
+    <parameter name="extension" value=".jwr"/>
+   </handler>-->
+  </requestFlow>
+ </globalConfiguration>
+ <handler name="LocalResponder" 
type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate" 
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="AdminService" provider="java:MSG">
+  <parameter name="allowedMethods" value="AdminService"/>
+  <parameter name="enableRemoteAdmin" value="false"/>
+  <parameter name="className" value="org.apache.axis.utils.Admin"/>
+  <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+ </service>
+ <service name="Version" provider="java:RPC">
+  <parameter name="allowedMethods" value="getVersion"/>
+  <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
+ <transport name="http">
+  <requestFlow>
+   <handler type="URLMapper"/>
+   <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+  </requestFlow>
+  <parameter name="qs:list" 
value="org.apache.axis.transport.http.QSListHandler"/>
+  <parameter name="qs:wsdl" 
value="org.apache.axis.transport.http.QSWSDLHandler"/>
+  <parameter name="qs:method" 
value="org.apache.axis.transport.http.QSMethodHandler"/>
+ </transport>
+ <transport name="local">
+  <responseFlow>
+   <handler type="LocalResponder"/>
+  </responseFlow>
+ </transport>
+</deployment>
+

Added: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/InstantiateControls.jws
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/InstantiateControls.jws?view=auto&rev=106252
==============================================================================
--- (empty file)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/InstantiateControls.jws
       Mon Nov 22 16:45:10 2004
@@ -0,0 +1,65 @@
+/*
+ * jws to test controls
+ * 
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 
+ * Licensed 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.
+ * 
+ * 
+ * Original author: James Song
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.rpc.server.ServletEndpointContext;
+import javax.xml.rpc.server.ServiceLifecycle;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.test.controls.instantiate.HelloControlBean;
+
+/*******************************************************************************
+ * A WebService that test control instantiation
+ *
+ * @author James Song
+ */
[EMAIL PROTECTED](name = "InstantiateControls",
+            serviceName = "InstantiateControlsService",
+            targetNamespace = 
+            "http://beehive.apache.org/controls/test";)
+public class InstantiateControls implements ServiceLifecycle {
+
+    @Control
+    public HelloControlBean helloBean;
+
+    private ServletEndpointContext mSec;
+
+    public void init(Object sec)
+    {
+        mSec = (ServletEndpointContext)sec;
+    }
+
+    public void destroy()
+    {
+        mSec = null;
+    }
+
+    @WebMethod(action = "sayHello")
+    @WebResult(name = "String")
+    public String sayHello()
+    {
+       String result=helloBean.hello("Bob");
+        return result;
+    }
+}
\ No newline at end of file

Added: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws?view=auto&rev=106252
==============================================================================
--- (empty file)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws
 Mon Nov 22 16:45:10 2004
@@ -0,0 +1,30 @@
+package jws;
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed 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.
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
[EMAIL PROTECTED]
+public class Hello
+{
+    @WebMethod
+    public String sayHelloWorld()
+    {        
+        return "Hello world!";
+    }
+}

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml?view=diff&rev=106252&p1=incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml&r1=106251&p2=incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml&r2=106252
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml   
(original)
+++ incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml   
Mon Nov 22 16:45:10 2004
@@ -18,6 +18,21 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
 
+  <filter>
+    <filter-name>ControlFilter</filter-name>
+    
<filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>ControlFilter</filter-name>
+    <url-pattern>*.jws</url-pattern>
+  </filter-mapping>
+
+  <listener>
+    
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+  </listener>
+
+
     <!-- Action Servlet Configuration (with debugging) -->
     <servlet>
         <servlet-name>action</servlet-name>
@@ -41,6 +56,36 @@
         <load-on-startup>2</load-on-startup>
     </servlet>
 
+  <servlet>
+    <servlet-name>AxisServlet</servlet-name>
+    <display-name>Apache-Axis Servlet</display-name>
+    <servlet-class>
+        org.apache.axis.transport.http.AxisServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>AdminServlet</servlet-name>
+    <display-name>Axis Admin Servlet</display-name>
+    <servlet-class>
+        org.apache.axis.transport.http.AdminServlet
+    </servlet-class>
+    <load-on-startup>100</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>SOAPMonitorService</servlet-name>
+    <display-name>SOAPMonitorService</display-name>
+    <servlet-class>
+        org.apache.axis.monitor.SOAPMonitorService
+    </servlet-class>
+    <init-param>
+      <param-name>SOAPMonitorPort</param-name>
+      <param-value>5001</param-value>
+    </init-param>
+    <load-on-startup>100</load-on-startup>
+  </servlet>
+
     <!-- Struts Action Servlet Mappings -->
     <!-- Note that because Struts takes the *last* mapping here as the 
extension to add to
          actions posted from forms, we must have *.do come after *.jpf. -->
@@ -53,6 +98,38 @@
         <servlet-name>action</servlet-name>
         <url-pattern>*.do</url-pattern>
     </servlet-mapping>
+
+  <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>SOAPMonitorService</servlet-name>
+    <url-pattern>/SOAPMonitor</url-pattern>
+  </servlet-mapping>
+
+  <mime-mapping>
+    <extension>wsdl</extension>
+     <mime-type>text/xml</mime-type>
+  </mime-mapping>
+  
+
+  <mime-mapping>
+    <extension>xsd</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties?view=diff&rev=106252&p1=incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties&r1=106251&p2=incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties&r2=106252
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties    
(original)
+++ incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties    
Mon Nov 22 16:45:10 2004
@@ -1,4 +1,5 @@
 app.inject.netui: true
+app.inject.wsm: true
 app.inject.milton: true
 app.inject.derby: true
 app.inject.dbControl: true

Reply via email to