Author: mmerz
Date: Fri Nov 5 16:41:23 2004
New Revision: 56713
Added:
incubator/beehive/trunk/samples/AddressBookWS/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/attachments/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/attachments/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/build.xml
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/client-build.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/client-build.xml
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/server-config.wsdd
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/log4j.properties
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/log4j.properties
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/Address.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/Address.java
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/AddressBook.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/AddressBook.java
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/Phone.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/Phone.java
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/StateType.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/org/apache/beehive/sample/StateType.java
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/web/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/web/
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/src/web/Service.jws
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/src/web/Service.jws
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/web.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/WEB-INF/web.xml
incubator/beehive/trunk/samples/AddressBookWS/happyaxis.jsp
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/happyaxis.jsp
incubator/beehive/trunk/samples/AddressBookWS/index.html
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/AddressBookWS/index.html
incubator/beehive/trunk/samples/EmployeeWS/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/attachments/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/attachments/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/build.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/build.xml
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-build.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-build.xml
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-tests/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-tests/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-tests/org/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-tests/org/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-tests/org/apache/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-tests/org/apache/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-tests/org/apache/beehive/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-tests/org/apache/beehive/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-tests/org/apache/beehive/EmployeeDB/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-tests/org/apache/beehive/EmployeeDB/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/client-tests/org/apache/beehive/EmployeeDB/EmployeeWSTestCase.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/client-tests/org/apache/beehive/EmployeeDB/EmployeeWSTestCase.java
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/server-config.wsdd
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/log4j.properties
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/log4j.properties
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/org/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/org/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/org/apache/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/org/apache/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/WSEmployee.java
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/WSEmployee.java
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/web/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/web/
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/src/web/Service.jws
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/src/web/Service.jws
incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/web.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/WEB-INF/web.xml
incubator/beehive/trunk/samples/EmployeeWS/happyaxis.jsp
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/happyaxis.jsp
incubator/beehive/trunk/samples/EmployeeWS/index.html
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/EmployeeWS/index.html
incubator/beehive/trunk/samples/wsm-blank/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/client-build.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/client-build.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/server-config.wsdd
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/src/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/log4j.properties
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/src/log4j.properties
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/
- copied from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/src/template/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/src/template/Blank.jws
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/web.xml
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/WEB-INF/web.xml
incubator/beehive/trunk/samples/wsm-blank/happyaxis.jsp
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/happyaxis.jsp
incubator/beehive/trunk/samples/wsm-blank/index.html
- copied unchanged from rev 56690,
incubator/beehive/branches/v1/alpha/samples/wsm-blank/index.html
Removed:
incubator/beehive/trunk/samples/PetStoreDashboard/readme.txt
incubator/beehive/trunk/wsm/test/webapps/
Modified:
incubator/beehive/trunk/samples/PetStoreDashboard/build.xml
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreProductView.java
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws
incubator/beehive/trunk/wsm/build.xml
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
Log:
Merging WSM alpha-branch back into trunk.
Modified: incubator/beehive/trunk/samples/PetStoreDashboard/build.xml
==============================================================================
--- incubator/beehive/trunk/samples/PetStoreDashboard/build.xml (original)
+++ incubator/beehive/trunk/samples/PetStoreDashboard/build.xml Fri Nov 5
16:41:23 2004
@@ -3,7 +3,7 @@
<project name="PetStoreDashboard" basedir="." default="all">
<property name="wsdl.url"
- value="http://localhost:8080/petstoreWeb/petstore.jws?wsdl"; />
+
value="http://localhost:8080/petstoreWeb/PetstoreInventoryManager.jws?wsdl"; />
<path id="jars">
Modified:
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java
==============================================================================
---
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java
(original)
+++
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreDashboard.java
Fri Nov 5 16:41:23 2004
@@ -31,17 +31,17 @@
import javax.swing.JPanel;
import javax.swing.JSplitPane;
-import org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManager;
+import org.apache.beehive.petstore.PetstoreInventoryManager;
public class PetStoreDashboard extends JPanel {
private static final long serialVersionUID = 1L;
- PetStoreInventoryManager store;
+ PetstoreInventoryManager store;
private PetStoreProductView productView;
- public PetStoreDashboard(PetStoreInventoryManager store) {
+ public PetStoreDashboard(PetstoreInventoryManager store) {
super(new GridLayout(1, 0));
this.store = store;
@@ -76,11 +76,11 @@
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- PetStoreInventoryManager store;
+ PetstoreInventoryManager store;
try {
- store =
(org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManagerSoapBindingStub)
- new
org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManagementServiceLocator().getPetStoreInventoryManager();
+ store =
(org.apache.beehive.petstore.PetstoreInventoryManagerSoapBindingStub)
+ new
org.apache.beehive.petstore.PetstoreInventoryManagementServiceLocator().getPetstoreInventoryManager();
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -89,7 +89,7 @@
}
// Time out after a minute
-
((org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManagerSoapBindingStub)store).setTimeout(60000);
+
((org.apache.beehive.petstore.PetstoreInventoryManagerSoapBindingStub)store).setTimeout(60000);
@@ -110,4 +110,4 @@
}
});
}
-}
\ No newline at end of file
+}
Modified:
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreProductView.java
==============================================================================
---
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreProductView.java
(original)
+++
incubator/beehive/trunk/samples/PetStoreDashboard/src/ui/PetStoreProductView.java
Fri Nov 5 16:41:23 2004
@@ -48,8 +48,8 @@
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeSelectionModel;
-import org.apache.beehive.PetStoreInventoryManager.InvalidIdentifierException;
-import org.apache.beehive.PetStoreInventoryManager.PetStoreInventoryManager;
+import org.apache.beehive.petstore.InvalidIdentifierException;
+import org.apache.beehive.petstore.PetstoreInventoryManager;
import org.apache.beehive.samples.petstore.model.Item;
import org.apache.beehive.samples.petstore.model.ws.Category;
import org.apache.beehive.samples.petstore.model.ws.Product;
@@ -60,7 +60,7 @@
TreeSelectionListener {
private static final long serialVersionUID = 1L;
- PetStoreInventoryManager store;
+ PetstoreInventoryManager store;
private JTree tree;
@@ -72,7 +72,7 @@
private ProductItemView currentProductItemView;
- public PetStoreProductView(PetStoreInventoryManager store) {
+ public PetStoreProductView(PetstoreInventoryManager store) {
super(new GridLayout(1, 0));
this.store = store;
@@ -475,4 +475,4 @@
}
-}
\ No newline at end of file
+}
Modified:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws
==============================================================================
---
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws
(original)
+++
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws
Fri Nov 5 16:41:23 2004
@@ -53,10 +53,10 @@
*
* @author Jonathan Colwell
*/
[EMAIL PROTECTED](name = "PetStoreInventoryManager",
- serviceName = "PetStoreInventoryManagementService",
[EMAIL PROTECTED](name = "PetstoreInventoryManager",
+ serviceName = "PetstoreInventoryManagementService",
targetNamespace =
- "http://beehive.apache.org/PetstoreInventoryManager";)
+ "http://beehive.apache.org/petstore";)
//@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.ENCODED)
public class PetstoreInventoryManager implements ServiceLifecycle {
@@ -88,9 +88,6 @@
.instantiate(getClass().getClassLoader(),
CatalogControlBean.class.getName());
}
- else {
- System.out.println("AutoInstantiation for controls is in
effect");
- }
}
catch (Exception e) {
e.printStackTrace();
@@ -166,11 +163,11 @@
@WebResult(name = "CategoryList")
public org.apache.beehive.samples.petstore.model.ws.Category[]
listCategories()
{
- System.out.println("listing categories");
+
try {
Category[] categories = getCatalogBean().getCategoryList();
if (categories != null && categories.length > 0) {
- System.out.println("got " + categories.length + " categories");
+
org.apache.beehive.samples.petstore.model.ws.Category[]
outCats =
new
org.apache.beehive.samples.petstore.model.ws.Category[categories.length];
@@ -180,12 +177,8 @@
outCats[j] = new
org.apache.beehive.samples.petstore.model.ws.Category
(categories[j], img);
}
- System.out.println("returning " + outCats.length + "
categories");
return outCats;
}
- else {
- System.out.println("got no categories");
- }
}
catch (Throwable e) {
e.printStackTrace();
@@ -225,4 +218,4 @@
("A price cannot be set for a null Item");
}
}
-}
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/wsm/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Fri Nov 5 16:41:23 2004
@@ -15,7 +15,7 @@
$Header:$
-->
-<project name="wsm" default="usage" basedir=".">
+<project name="Beehive/WSM Framework Build" default="usage" basedir=".">
<property environment="os"/>
<property file="../beehive.properties"/>
<!-- THE WSM BUILD REQUIRES JDK5 AND LATER. ATTEMPTS TO BUILD ON JDK
EALRIER THAN 5.0 WILL BE A NOOP -->
@@ -26,11 +26,7 @@
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jars.dir" value="${build.dir}/jars"/>
<property name="docs.dir" value="${build.dir}/docs"/>
- <property name="wsm.dist.dir" value="${build.dir}/dist"/>
- <property name="webapps.dist.dir" value="${wsm.dist.dir}/webapps"/>
- <property name="test.dir" value="test"/>
- <property name="webapps.dir" value="${test.dir}/webapps"/>
- <property name="axis.dir" value="AnnotatedAxis"/>
+ <property name="template.dir" value="src/webapp-template/default" />
<property name="api.dir" value="src/api"/>
<property name="api.classes" value="${classes.dir}/api"/>
<property name="runtime.dir" value="src/runtime"/>
@@ -114,7 +110,6 @@
<mkdir dir="${runtime.classes}"/>
<mkdir dir="${jars.dir}"/>
<mkdir dir="${docs.dir}"/>
- <mkdir dir="${wsm.dist.dir}"/>
</target>
<!-- ====================================================================
-->
<!-- Compiles the source code of the project. -->
@@ -222,21 +217,7 @@
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy starting |"/>
<echo message="--------------------------------------------------"/>
- <mkdir dir="${webapps.dist.dir}"/>
- <copy todir="${webapps.dist.dir}/${axis.dir}">
- <fileset dir="${webapps.dir}/${axis.dir}"/>
- </copy>
- <copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
- <fileset refid="axis.jars"/>
- </copy>
- <copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
- <fileset dir="${jars.dir}" includes="**/*.jar"/>
- </copy>
- <copy file="${controls.jar}"
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
- <copy file="${velocity14.jar}"
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
- <copy file="${velocitydep14.jar}"
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
- <copy file="${log4j.jar}"
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
- <copy file="${xbean.jar}"
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
+
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy ending |"/>
<echo message="--------------------------------------------------"/>
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
Fri Nov 5 16:41:23 2004
@@ -192,12 +192,12 @@
int indexOfDot = relPath.indexOf(".");
if (-1 != indexOfDot) relPath = relPath.substring(0,
indexOfDot);
String clsName = relPath.replaceAll("/", ".");
- log.debug("look for webserivce in class: " + clsName);
- try {
+ log.info("looking for webserivce in class: " + clsName);
+ try {
Class result =
getClass().getClassLoader().loadClass(clsName);
return result;
} catch (ClassNotFoundException e) {
- log.debug("class: " + clsName + " was not found by the
AnnotatedWebServiceDeploymentHandler continue to the next handler. ");
+ log.info("class: " + clsName + " was not found by the
AnnotatedWebServiceDeploymentHandler continue to the next handler. ");
return null;
}
}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
Fri Nov 5 16:41:23 2004
@@ -42,7 +42,15 @@
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
+/**
+ * WsmAnnotationProcessor provides an API for IDEs and other applications to
+ * perform code validation.
+ *
+ * todo This class is currently disabled; the object model is solely built
+ * through reflection.
+ */
public class WsmAnnotationProcessor extends TwoPhaseAnnotationProcessor {
+
/**
* Constructor.
*/
@@ -55,6 +63,11 @@
*/
@Override
public void check(Declaration decl) {
+ if (null != decl)
+ {
+ return;
+ }
+
// check type of declaration
if (null == decl) {
throw new ProcessorException("Declaration type \"null\" not
allowed");
@@ -104,6 +117,8 @@
public void generate(Declaration decl) {
// jws-class file is the only artifact to be generated, which is
// done automatically as part of apt
+
+ return;
}
/**
