You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by sc...@apache.org on 2005/03/23 18:53:10 UTC
svn commit: r158810 - in incubator/muse/trunk/src/site/content/interop: ./
lib/ src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/
src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/
src/java/org/apache/ws/resource/example/blackberry/
src/java/org/apache/ws/resource/example/ipmiserver/
src/java/org/apache/ws/resource/example/mowsfactory/
src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/ src/wsdl/
Author: scamp
Date: Wed Mar 23 09:53:06 2005
New Revision: 158810
URL: http://svn.apache.org/viewcvs?view=rev&rev=158810
Log: (empty)
Modified:
incubator/muse/trunk/src/site/content/interop/ (props changed)
incubator/muse/trunk/src/site/content/interop/build.properties
incubator/muse/trunk/src/site/content/interop/build.xml
incubator/muse/trunk/src/site/content/interop/lib/weatherstation-xbeans.jar
incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/FCCIDDocument.java
incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherStationPropertiesDocument.java
incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/FCCIDDocumentImpl.java
incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/WeatherStationPropertiesDocumentImpl.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverHome.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverResource.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryHome.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryResource.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/Mowsfactory_jndi-config.xml
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java
incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl
Propchange: incubator/muse/trunk/src/site/content/interop/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 23 09:53:06 2005
@@ -1 +1,2 @@
*.iml
+classes
Modified: incubator/muse/trunk/src/site/content/interop/build.properties
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/build.properties?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/build.properties (original)
+++ incubator/muse/trunk/src/site/content/interop/build.properties Wed Mar 23 09:53:06 2005
@@ -4,7 +4,7 @@
# Uncomment and modify the below lines if you would like to deploy to a
# wsdm webapp located somewhere other than the default location of
# ../webapps/wsdm (e.g. ${env.CATALINA_HOME}/webapps/wsdm)
-wsdm.webapp.dir=${env.CATALINA_HOME}/webapps/wsdm
+wsdm.webapp.dir=${env.CATALINA_HOME}/webapps/hermes
# Uncomment and modify the below lines if you require a proxy to connect to external web sites
#http.proxyHost=proxy.xyz.com
Modified: incubator/muse/trunk/src/site/content/interop/build.xml
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/build.xml?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/build.xml (original)
+++ incubator/muse/trunk/src/site/content/interop/build.xml Wed Mar 23 09:53:06 2005
@@ -39,8 +39,10 @@
<property name="tmp.dir" location="${wsdm.webapp.dir}/_tmp_" />
<mkdir dir="${tmp.dir}" />
- <copy todir="${tmp.dir}" includes="**/*" overwrite="true">
- <fileset dir="${wsdl.dir}" />
+ <copy todir="${tmp.dir}" overwrite="true">
+ <fileset dir="${wsdl.dir}">
+ <include name="**/*"/>
+ </fileset>
</copy>
<mkdir dir="${wsdm.webapp.dir}/wsdl" />
@@ -81,19 +83,21 @@
depends="init"
description="deploys the JobPort service to the wsdm webapp">
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes/wsdl" includes="**/*.wsdl" overwrite="true" verbose="true">
- <fileset dir="${wsdl.dir}"/>
+ <copy todir="${wsdm.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true">
+ <fileset dir="${wsdl.dir}" includes="**/*.wsdl"/>
</copy>
<mkdir dir="${wsdm.webapp.dir}/wsdl" />
- <copy todir="${wsdm.webapp.dir}/wsdl" includes="**/*.xsd" overwrite="true" verbose="true">
- <fileset dir="${wsdl.dir}"/>
+ <copy todir="${wsdm.webapp.dir}/wsdl" overwrite="true" verbose="true">
+ <fileset dir="${wsdl.dir}" includes="**/*.xsd"/>
</copy>
<echo>Deploying classes to ${wsdm.webapp.dir}/WEB-INF/classes/...</echo>
<copy todir="${wsdm.webapp.dir}/WEB-INF/classes" overwrite="true" verbose="true" >
<fileset dir="${classes.dir}" />
</copy>
- <copy file="${jar.dir}/**/*.jar" todir="${wsdm.webapp.dir}/WEB-INF/lib" />
+ <copy todir="${wsdm.webapp.dir}/WEB-INF/lib">
+ <fileset dir="${jar.dir}" includes="**/*.jar" />
+ </copy>
<!-- update server-config.wsdd using WsddUpdater -->
<taskdef name="wsddUpdater" classname="org.apache.ws.util.platform.axis.tool.WsddUpdater" classpathref="muse.classpath.id" />
<property name="config.wsdd" location="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd" /> <!-- normalize path -->
Modified: incubator/muse/trunk/src/site/content/interop/lib/weatherstation-xbeans.jar
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/lib/weatherstation-xbeans.jar?view=diff&r1=158809&r2=158810
==============================================================================
Binary files - no diff available.
Modified: incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/FCCIDDocument.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/FCCIDDocument.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/FCCIDDocument.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/FCCIDDocument.java Wed Mar 23 09:53:06 2005
@@ -16,22 +16,27 @@
*/
public interface FCCIDDocument extends org.apache.xmlbeans.XmlObject
{
- public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)schema.system.sD31DC0590796F8DBD740CDEA580F803F.TypeSystemHolder.typeSystem.resolveHandle("fccidfaacdoctype");
+ public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)schema.system.sE90E70ED05A3991EAA523D38B3174C5A.TypeSystemHolder.typeSystem.resolveHandle("fccidfaacdoctype");
/**
* Gets the "FCCID" element
*/
- org.apache.xmlbeans.XmlObject getFCCID();
+ java.math.BigInteger getFCCID();
+
+ /**
+ * Gets (as xml) the "FCCID" element
+ */
+ org.apache.xmlbeans.XmlPositiveInteger xgetFCCID();
/**
* Sets the "FCCID" element
*/
- void setFCCID(org.apache.xmlbeans.XmlObject fccid);
+ void setFCCID(java.math.BigInteger fccid);
/**
- * Appends and returns a new empty "FCCID" element
+ * Sets (as xml) the "FCCID" element
*/
- org.apache.xmlbeans.XmlObject addNewFCCID();
+ void xsetFCCID(org.apache.xmlbeans.XmlPositiveInteger fccid);
/**
* A factory class with static methods for creating instances
Modified: incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherStationPropertiesDocument.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherStationPropertiesDocument.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherStationPropertiesDocument.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherStationPropertiesDocument.java Wed Mar 23 09:53:06 2005
@@ -16,7 +16,7 @@
*/
public interface WeatherStationPropertiesDocument extends org.apache.xmlbeans.XmlObject
{
- public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)schema.system.sD31DC0590796F8DBD740CDEA580F803F.TypeSystemHolder.typeSystem.resolveHandle("weatherstationpropertiesfa88doctype");
+ public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)schema.system.sE90E70ED05A3991EAA523D38B3174C5A.TypeSystemHolder.typeSystem.resolveHandle("weatherstationpropertiesfa88doctype");
/**
* Gets the "WeatherStationProperties" element
@@ -40,7 +40,7 @@
*/
public interface WeatherStationProperties extends org.apache.xmlbeans.XmlObject
{
- public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)schema.system.sD31DC0590796F8DBD740CDEA580F803F.TypeSystemHolder.typeSystem.resolveHandle("weatherstationpropertiesa177elemtype");
+ public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)schema.system.sE90E70ED05A3991EAA523D38B3174C5A.TypeSystemHolder.typeSystem.resolveHandle("weatherstationpropertiesa177elemtype");
/**
* Gets the "ResourceId" element
@@ -595,17 +595,22 @@
/**
* Gets the "FCCID" element
*/
- org.apache.xmlbeans.XmlObject getFCCID();
+ java.math.BigInteger getFCCID();
+
+ /**
+ * Gets (as xml) the "FCCID" element
+ */
+ org.apache.xmlbeans.XmlPositiveInteger xgetFCCID();
/**
* Sets the "FCCID" element
*/
- void setFCCID(org.apache.xmlbeans.XmlObject fccid);
+ void setFCCID(java.math.BigInteger fccid);
/**
- * Appends and returns a new empty "FCCID" element
+ * Sets (as xml) the "FCCID" element
*/
- org.apache.xmlbeans.XmlObject addNewFCCID();
+ void xsetFCCID(org.apache.xmlbeans.XmlPositiveInteger fccid);
/**
* A factory class with static methods for creating instances
Modified: incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/FCCIDDocumentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/FCCIDDocumentImpl.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/FCCIDDocumentImpl.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/FCCIDDocumentImpl.java Wed Mar 23 09:53:06 2005
@@ -27,17 +27,31 @@
/**
* Gets the "FCCID" element
*/
- public org.apache.xmlbeans.XmlObject getFCCID()
+ public java.math.BigInteger getFCCID()
{
synchronized (monitor())
{
check_orphaned();
- org.apache.xmlbeans.XmlObject target = null;
- target = (org.apache.xmlbeans.XmlObject)get_store().find_element_user(FCCID$0, 0);
+ org.apache.xmlbeans.SimpleValue target = null;
+ target = (org.apache.xmlbeans.SimpleValue)get_store().find_element_user(FCCID$0, 0);
if (target == null)
{
return null;
}
+ return target.getBigIntegerValue();
+ }
+ }
+
+ /**
+ * Gets (as xml) the "FCCID" element
+ */
+ public org.apache.xmlbeans.XmlPositiveInteger xgetFCCID()
+ {
+ synchronized (monitor())
+ {
+ check_orphaned();
+ org.apache.xmlbeans.XmlPositiveInteger target = null;
+ target = (org.apache.xmlbeans.XmlPositiveInteger)get_store().find_element_user(FCCID$0, 0);
return target;
}
}
@@ -45,32 +59,36 @@
/**
* Sets the "FCCID" element
*/
- public void setFCCID(org.apache.xmlbeans.XmlObject fccid)
+ public void setFCCID(java.math.BigInteger fccid)
{
synchronized (monitor())
{
check_orphaned();
- org.apache.xmlbeans.XmlObject target = null;
- target = (org.apache.xmlbeans.XmlObject)get_store().find_element_user(FCCID$0, 0);
+ org.apache.xmlbeans.SimpleValue target = null;
+ target = (org.apache.xmlbeans.SimpleValue)get_store().find_element_user(FCCID$0, 0);
if (target == null)
{
- target = (org.apache.xmlbeans.XmlObject)get_store().add_element_user(FCCID$0);
+ target = (org.apache.xmlbeans.SimpleValue)get_store().add_element_user(FCCID$0);
}
- target.set(fccid);
+ target.setBigIntegerValue(fccid);
}
}
/**
- * Appends and returns a new empty "FCCID" element
+ * Sets (as xml) the "FCCID" element
*/
- public org.apache.xmlbeans.XmlObject addNewFCCID()
+ public void xsetFCCID(org.apache.xmlbeans.XmlPositiveInteger fccid)
{
synchronized (monitor())
{
check_orphaned();
- org.apache.xmlbeans.XmlObject target = null;
- target = (org.apache.xmlbeans.XmlObject)get_store().add_element_user(FCCID$0);
- return target;
+ org.apache.xmlbeans.XmlPositiveInteger target = null;
+ target = (org.apache.xmlbeans.XmlPositiveInteger)get_store().find_element_user(FCCID$0, 0);
+ if (target == null)
+ {
+ target = (org.apache.xmlbeans.XmlPositiveInteger)get_store().add_element_user(FCCID$0);
+ }
+ target.set(fccid);
}
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/WeatherStationPropertiesDocumentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/WeatherStationPropertiesDocumentImpl.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/WeatherStationPropertiesDocumentImpl.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/.xmlbeans/src/org/everestWeather/wsdm/samples/x2005/x04/schema/impl/WeatherStationPropertiesDocumentImpl.java Wed Mar 23 09:53:06 2005
@@ -1805,17 +1805,31 @@
/**
* Gets the "FCCID" element
*/
- public org.apache.xmlbeans.XmlObject getFCCID()
+ public java.math.BigInteger getFCCID()
{
synchronized (monitor())
{
check_orphaned();
- org.apache.xmlbeans.XmlObject target = null;
- target = (org.apache.xmlbeans.XmlObject)get_store().find_element_user(FCCID$38, 0);
+ org.apache.xmlbeans.SimpleValue target = null;
+ target = (org.apache.xmlbeans.SimpleValue)get_store().find_element_user(FCCID$38, 0);
if (target == null)
{
return null;
}
+ return target.getBigIntegerValue();
+ }
+ }
+
+ /**
+ * Gets (as xml) the "FCCID" element
+ */
+ public org.apache.xmlbeans.XmlPositiveInteger xgetFCCID()
+ {
+ synchronized (monitor())
+ {
+ check_orphaned();
+ org.apache.xmlbeans.XmlPositiveInteger target = null;
+ target = (org.apache.xmlbeans.XmlPositiveInteger)get_store().find_element_user(FCCID$38, 0);
return target;
}
}
@@ -1823,32 +1837,36 @@
/**
* Sets the "FCCID" element
*/
- public void setFCCID(org.apache.xmlbeans.XmlObject fccid)
+ public void setFCCID(java.math.BigInteger fccid)
{
synchronized (monitor())
{
check_orphaned();
- org.apache.xmlbeans.XmlObject target = null;
- target = (org.apache.xmlbeans.XmlObject)get_store().find_element_user(FCCID$38, 0);
+ org.apache.xmlbeans.SimpleValue target = null;
+ target = (org.apache.xmlbeans.SimpleValue)get_store().find_element_user(FCCID$38, 0);
if (target == null)
{
- target = (org.apache.xmlbeans.XmlObject)get_store().add_element_user(FCCID$38);
+ target = (org.apache.xmlbeans.SimpleValue)get_store().add_element_user(FCCID$38);
}
- target.set(fccid);
+ target.setBigIntegerValue(fccid);
}
}
/**
- * Appends and returns a new empty "FCCID" element
+ * Sets (as xml) the "FCCID" element
*/
- public org.apache.xmlbeans.XmlObject addNewFCCID()
+ public void xsetFCCID(org.apache.xmlbeans.XmlPositiveInteger fccid)
{
synchronized (monitor())
{
check_orphaned();
- org.apache.xmlbeans.XmlObject target = null;
- target = (org.apache.xmlbeans.XmlObject)get_store().add_element_user(FCCID$38);
- return target;
+ org.apache.xmlbeans.XmlPositiveInteger target = null;
+ target = (org.apache.xmlbeans.XmlPositiveInteger)get_store().find_element_user(FCCID$38, 0);
+ if (target == null)
+ {
+ target = (org.apache.xmlbeans.XmlPositiveInteger)get_store().add_element_user(FCCID$38);
+ }
+ target.set(fccid);
}
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java Wed Mar 23 09:53:06 2005
@@ -6,6 +6,7 @@
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
import java.io.Serializable;
@@ -17,6 +18,10 @@
extends AbstractResourceHome
implements Serializable
{
+ private static final String SERVICE_NAME = "blackberry";
+
+ public static final String HOME_LOCATION =
+ JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
/**
* TODO
@@ -42,7 +47,27 @@
}
catch ( ResourceException re )
{
- //todo add any checking for key validity
+ Object id = key.getValue();
+ /**
+ * Determine if the passed-in key is, in fact, something we expect.
+ */
+ if (id.equals("bb1") || id.equals("bb2"))
+ {
+ try
+ {
+ resource = createInstance(key);
+ }
+ catch (Exception e)
+ {
+ throw new ResourceException(e);
+ }
+ add(key, resource);
+ }
+ else
+ {
+ throw new ResourceUnknownException(id,
+ resourceContext.getServiceName());
+ }
}
return resource;
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java Wed Mar 23 09:53:06 2005
@@ -1,6 +1,10 @@
package org.apache.ws.resource.example.blackberry;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.muws.v1_0.capability.IdentityCapability;
+import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
+
/**
* A Blackberry WS-Resource.
* <p/>
@@ -9,8 +13,6 @@
public class BlackberryResource extends AbstractBlackberryResource
{
-
-
/**
* A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
*/
@@ -31,9 +33,14 @@
* call TopicUtils.addResourcePropertyValueChangeTopic for each
* Topic you'd like to expose property change notifications for.
*/
- org.apache.ws.notification.topics.util.TopicUtils.addResourcePropertyValueChangeTopics( getResourcePropertySet(), getTopicSpaceSet() );
-
- // TODO: init all custom properties - this includes setting values, registering callbacks, and adding prop value changed topics
+ org.apache.ws.notification.topics.util.TopicUtils.addResourcePropertyValueChangeTopics( getResourcePropertySet(), getTopicSpaceSet() );
+
+ org.apache.ws.resource.properties.ResourcePropertySet resourcePropertySet = getResourcePropertySet();
+
+ ResourceProperty resourceProperty = resourcePropertySet.get(BlackberryPropertyQNames.MANAGEABILITYCAPABILITY);
+ ManageabilityCapabilityDocument manageabilityCapabilityDocument = ManageabilityCapabilityDocument.Factory.newInstance();
+ manageabilityCapabilityDocument.setManageabilityCapability(IdentityCapability.URI);
+ resourceProperty.add(manageabilityCapabilityDocument);
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverHome.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverHome.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverHome.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverHome.java Wed Mar 23 09:53:06 2005
@@ -6,6 +6,7 @@
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
import java.io.Serializable;
@@ -17,6 +18,11 @@
extends AbstractResourceHome
implements Serializable
{
+ private static final String SERVICE_NAME = "ipmiserver";
+
+ public static final String HOME_LOCATION =
+ JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
+
/**
* TODO
@@ -42,7 +48,27 @@
}
catch ( ResourceException re )
{
- //todo add any checking for key validity
+ Object id = key.getValue();
+ /**
+ * Determine if the passed-in key is, in fact, something we expect.
+ */
+ if (id.equals("ipmi1") || id.equals("ipmi2"))
+ {
+ try
+ {
+ resource = createInstance(key);
+ }
+ catch (Exception e)
+ {
+ throw new ResourceException(e);
+ }
+ add(key, resource);
+ }
+ else
+ {
+ throw new ResourceUnknownException(id,
+ resourceContext.getServiceName());
+ }
}
return resource;
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverResource.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverResource.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverResource.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/ipmiserver/IpmiserverResource.java Wed Mar 23 09:53:06 2005
@@ -1,6 +1,10 @@
package org.apache.ws.resource.example.ipmiserver;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.muws.v1_0.capability.IdentityCapability;
+import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
+
/**
* A Ipmiserver WS-Resource.
* <p/>
@@ -33,7 +37,12 @@
*/
org.apache.ws.notification.topics.util.TopicUtils.addResourcePropertyValueChangeTopics( getResourcePropertySet(), getTopicSpaceSet() );
- // TODO: init all custom properties - this includes setting values, registering callbacks, and adding prop value changed topics
+ org.apache.ws.resource.properties.ResourcePropertySet resourcePropertySet = getResourcePropertySet();
+
+ ResourceProperty resourceProperty = resourcePropertySet.get(IpmiserverPropertyQNames.MANAGEABILITYCAPABILITY);
+ ManageabilityCapabilityDocument manageabilityCapabilityDocument = ManageabilityCapabilityDocument.Factory.newInstance();
+ manageabilityCapabilityDocument.setManageabilityCapability(IdentityCapability.URI);
+ resourceProperty.add(manageabilityCapabilityDocument);
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryHome.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryHome.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryHome.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryHome.java Wed Mar 23 09:53:06 2005
@@ -6,6 +6,7 @@
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
import java.io.Serializable;
@@ -17,6 +18,11 @@
extends AbstractResourceHome
implements Serializable
{
+ private static final String SERVICE_NAME = "mowsfactory";
+
+ public static final String HOME_LOCATION =
+ JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
+
/**
* TODO
@@ -42,7 +48,15 @@
}
catch ( ResourceException re )
{
- //todo add any checking for key validity
+ try
+ {
+ resource = createInstance(key);
+ }
+ catch (Exception e)
+ {
+ throw new ResourceException(e);
+ }
+ add(key, resource);
}
return resource;
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryResource.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryResource.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryResource.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/MowsfactoryResource.java Wed Mar 23 09:53:06 2005
@@ -1,6 +1,11 @@
package org.apache.ws.resource.example.mowsfactory;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.example.blackberry.BlackberryPropertyQNames;
+import org.apache.ws.muws.v1_0.capability.IdentityCapability;
+import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
+
/**
* A Mowsfactory WS-Resource.
* <p/>
@@ -9,8 +14,6 @@
public class MowsfactoryResource extends AbstractMowsfactoryResource
{
-
-
/**
* A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
*/
@@ -24,7 +27,12 @@
super.init();
- // TODO: init all custom properties - this includes setting values, registering callbacks, and adding prop value changed topics
+ org.apache.ws.resource.properties.ResourcePropertySet resourcePropertySet = getResourcePropertySet();
+
+ ResourceProperty resourceProperty = resourcePropertySet.get(MowsfactoryPropertyQNames.MANAGEABILITYCAPABILITY);
+ ManageabilityCapabilityDocument manageabilityCapabilityDocument = ManageabilityCapabilityDocument.Factory.newInstance();
+ manageabilityCapabilityDocument.setManageabilityCapability(IdentityCapability.URI);
+ resourceProperty.add(manageabilityCapabilityDocument);
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/Mowsfactory_jndi-config.xml
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/Mowsfactory_jndi-config.xml?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/Mowsfactory_jndi-config.xml (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/mowsfactory/Mowsfactory_jndi-config.xml Wed Mar 23 09:53:06 2005
@@ -17,12 +17,8 @@
<name>wsdlTargetNamespace</name>
<value>http://ws.apache.org/resource/example/mowsfactory</value>
</parameter>
-
- <parameter>
- <name>resourceKeyName</name>
- <value>{http://ws.apache.org/resource/example/mowsfactory}ResourceID</value>
- </parameter>
- </resourceParams>
+
+ </resourceParams>
</resource>
</service>
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java Wed Mar 23 09:53:06 2005
@@ -6,9 +6,11 @@
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
import java.io.Serializable;
+import java.math.BigInteger;
/**
* Home for Weatherstation WS-Resources.
@@ -17,6 +19,11 @@
extends AbstractResourceHome
implements Serializable
{
+ private static final String SERVICE_NAME = "weatherstation";
+
+ public static final String HOME_LOCATION =
+ JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
+
/**
* TODO
@@ -42,9 +49,34 @@
}
catch ( ResourceException re )
{
- //todo add any checking for key validity
+ Object id = key.getValue();
+ /**
+ * Determine if the passed-in key is, in fact, something we expect.
+ */
+ if (id.equals("weather1") || id.equals("weather2"))
+ {
+ try
+ {
+ resource = createInstance(key);
+ FCCIDDocument fccidDocument = FCCIDDocument.Factory.newInstance();
+ //set the same value for both instances
+ fccidDocument.setFCCID(BigInteger.ONE);
+ ((WeatherstationResource)resource).setFCCID(fccidDocument);
+ }
+ catch (Exception e)
+ {
+ throw new ResourceException(e);
+ }
+ add(key, resource);
+ }
+ else
+ {
+ throw new ResourceUnknownException(id,
+ resourceContext.getServiceName());
+ }
}
return resource;
+
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java Wed Mar 23 09:53:06 2005
@@ -1,16 +1,20 @@
package org.everestWeather.wsdm.samples.x2005.x04.schema;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.example.blackberry.BlackberryPropertyQNames;
+import org.apache.ws.muws.v1_0.capability.IdentityCapability;
+import org.apache.ws.muws.v1_0.capability.CorrelatablePropertiesCapability;
+import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
+
/**
* A Weatherstation WS-Resource.
* <p/>
* NOTE: This class is generated but IS meant to be modified.
*/
public class WeatherstationResource extends AbstractWeatherstationResource
-
{
-
/**
* A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
*/
@@ -23,10 +27,21 @@
{
super.init();
-
+ org.apache.ws.resource.properties.ResourcePropertySet resourcePropertySet = getResourcePropertySet();
-
- // TODO: init all custom properties - this includes setting values, registering callbacks, and adding prop value changed topics
+ ResourceProperty resourceProperty = resourcePropertySet.get(BlackberryPropertyQNames.MANAGEABILITYCAPABILITY);
+ ManageabilityCapabilityDocument manageabilityCapabilityDocument = ManageabilityCapabilityDocument.Factory.newInstance();
+ manageabilityCapabilityDocument.setManageabilityCapability(IdentityCapability.URI);
+ resourceProperty.add(manageabilityCapabilityDocument);
+
+ manageabilityCapabilityDocument = ManageabilityCapabilityDocument.Factory.newInstance();
+ manageabilityCapabilityDocument.setManageabilityCapability(CorrelatablePropertiesCapability.URI);
+ resourceProperty.add(manageabilityCapabilityDocument);
}
+ public void setFCCID(FCCIDDocument fccidDocument)
+ {
+ ResourceProperty resourceProperty = getResourcePropertySet().get(WeatherstationPropertyQNames.FCCID);
+ resourceProperty.add(fccidDocument);
+ }
}
Modified: incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl?view=diff&r1=158809&r2=158810
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl (original)
+++ incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl Wed Mar 23 09:53:06 2005
@@ -12,7 +12,7 @@
<import namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd" schemaLocation="../spec/wsdm/MUWS-Part1-1_0.xsd"/>
<import namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd" schemaLocation="../spec/wsdm/MUWS-Part2-1_0.xsd"/>
<import namespace="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.xsd" schemaLocation="../spec/wsdm/MOWS-1_0.xsd"/>
- <element name="FCCID"/>
+ <element name="FCCID" type="xsd:positiveInteger"/>
<!-- Resource Properties Document Schema -->
<element name="WeatherStationProperties">
<complexType>
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org