[jboss-svn-commits] JBL Code SVN: r34600 - in labs/jbossesb/trunk/product/docs: Programmers_Guide/en-US/extras/configuration and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 9 05:57:59 EDT 2010
Author: kevin.conner at jboss.com
Date: 2010-08-09 05:57:59 -0400 (Mon, 09 Aug 2010)
New Revision: 34600
Removed:
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/nodes2.xmlt
Modified:
labs/jbossesb/trunk/product/docs/Administration_Guide/en-US/extras/monitoring_and_management/threshold.xmlt
labs/jbossesb/trunk/product/docs/Programmers_Guide/en-US/extras/configuration/Code_Example19.xmlt
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/Configuring_the_Registry.xml
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/properties.xmlt
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/reg1.xmlt
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/properties1.xmlt
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/ms/interface.java
labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/security/securityservice.xmlt
Log:
Handle wrapping of includes: JBESB-3445
Modified: labs/jbossesb/trunk/product/docs/Administration_Guide/en-US/extras/monitoring_and_management/threshold.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Administration_Guide/en-US/extras/monitoring_and_management/threshold.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Administration_Guide/en-US/extras/monitoring_and_management/threshold.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -3,7 +3,9 @@
<mbean code="org.jboss.monitor.ThresholdMonitor"
name="jboss.monitor:service=ESBDLQMonitor">
<attribute name="MonitorName">ESB DeadLetterQueue Monitor</attribute>
- <attribute name="ObservedObject">jboss.esb:category=MessageCounter,deployment=jbossesb.esb,service-name=DeadLetterService</attribute>
+ <attribute name="ObservedObject">
+ jboss.esb:category=MessageCounter,deployment=jbossesb.esb,service-name=DeadLetterService
+ </attribute>
<attribute name="ObservedAttribute">overall service message count</attribute>
<attribute name="Threshold">4</attribute>
<attribute name="CompareTo">-1</attribute>
Modified: labs/jbossesb/trunk/product/docs/Programmers_Guide/en-US/extras/configuration/Code_Example19.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Programmers_Guide/en-US/extras/configuration/Code_Example19.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Programmers_Guide/en-US/extras/configuration/Code_Example19.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -4,6 +4,7 @@
is-gateway="true"
schedule-frequency="5">
<property name="remoteFileSystemStrategy-configFile" value="./ftpfile-cache-config.xml"/>
- <property name="remoteFileSystemStrategy-cacheListener" value="org.jboss.soa.esb.listeners.gateway.remotestrategies.cache.DeleteOnEvictTreeCacheListener"/>
+ <property name="remoteFileSystemStrategy-cacheListener" value=
+ "org.jboss.soa.esb.listeners.gateway.remotestrategies.cache.DeleteOnEvictTreeCacheListener"/>
</ftp-listener>
Modified: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/Configuring_the_Registry.xml
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/Configuring_the_Registry.xml 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/Configuring_the_Registry.xml 2010-08-09 09:57:59 UTC (rev 34600)
@@ -390,9 +390,79 @@
the query and lifecycle URIs. For example:
</para>
- <programlisting language="XML" role="XML"><xi:include href="extras/configuring_the_registry/nodes2.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></programlisting>
-
-
+ <table>
+ <title>Registry URIs</title>
+ <tgroup cols="2" colsep="1" rowsep="1">
+ <colspec colwidth="1*"/>
+ <colspec colwidth="2*"/>
+ <thead>
+ <row>
+ <entry>SOAP</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>queryManagerURI</entry>
+ <entry>http://localhost:8080/juddi/inquiry</entry>
+ </row>
+ <row>
+ <entry>lifeCycleManagerURI</entry>
+ <entry>http://localhost:8080/juddi/publish</entry>
+ </row>
+ <row>
+ <entry>transportClass</entry>
+ <entry>org.apache.ws.scout.transport.AxisTransport</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ <tgroup cols="2" colsep="1" rowsep="1">
+ <colspec colwidth="1*"/>
+ <colspec colwidth="2*"/>
+ <thead>
+ <row>
+ <entry>RMI</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>queryManagerURI</entry>
+ <entry>jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire</entry>
+ </row>
+ <row>
+ <entry>lifeCycleManagerURI</entry>
+ <entry>jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish</entry>
+ </row>
+ <row>
+ <entry>transportClass</entry>
+ <entry>org.apache.ws.scout.transport.RMITransport</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ <tgroup cols="2" colsep="1" rowsep="1">
+ <colspec colwidth="1*"/>
+ <colspec colwidth="2*"/>
+ <thead>
+ <row>
+ <entry>local</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>queryManagerURI</entry>
+ <entry>org.apache.juddi.registry.local.InquiryService#inquire</entry>
+ </row>
+ <row>
+ <entry>lifeCycleManagerURI</entry>
+ <entry>org.apache.juddi.registry.local.PublishService#publish</entry>
+ </row>
+ <row>
+ <entry>transportClass</entry>
+ <entry>org.apache.ws.scout.transport.LocalTransport</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
<para>
For jUDDI we have two requirements that need to be fulfilled:
</para>
Modified: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/properties.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/properties.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/properties.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -2,7 +2,8 @@
Properties env = new Properties();
env.setProperty(RegistryEngine.PROPNAME_JAVA_NAMING_FACTORY_INITIAL,factoryInitial);
env.setProperty(RegistryEngine.PROPNAME_JAVA_NAMING_PROVIDER_URL, providerURL);
-env.setProperty(RegistryEngine.PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, factoryURLPkgs);
+env.setProperty(RegistryEngine.PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS,
+ factoryURLPkgs);
InitialContext context = new InitialContext(env);
Inquiry inquiry = new InquiryService();
Modified: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/reg1.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/reg1.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_examples/reg1.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -1,19 +1,21 @@
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass"
+ value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass"
+ value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
-value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI"
+ value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
-value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish"/>
- <property name="org.jboss.soa.esb.registry.securityManagerURI"
-value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish"/>
->
-
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
-
- <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.RMITransport"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
+ value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI"
+ value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish"/>
+
+ <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.registry.password" value="password"/>
+
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass"
+ value="org.apache.ws.scout.transport.RMITransport"/>
</properties>
Deleted: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/nodes2.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/nodes2.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/nodes2.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -1,14 +0,0 @@
-SOAP
-queryManagerURI http://localhost:8080/juddi/inquiry
-lifeCycleManagerURI http://localhost:8080/juddi/publish
-transportClass org.apache.ws.scout.transport.AxisTransport
-
-RMI
-queryManagerURI jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire
-lifeCycleManagerURI jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish
-transportClass org.apache.ws.scout.transport.RMITransport
-
-Local
-queryManagerURI org.apache.juddi.registry.local.InquiryService#inquire
-lifeCycleManagerURI org.apache.juddi.registry.local.PublishService#publish
-transportClass org.apache.ws.scout.transport.LocalTransport
Modified: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/properties1.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/properties1.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/configuring_the_registry/properties1.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -1,28 +1,34 @@
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
-
- <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
-
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
-
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
- <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
-
- <property name="org.jboss.soa.esb.registry.user" value="root"/>
- <property name="org.jboss.soa.esb.registry.password" value="root"/>
-
- <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
- <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
-
- <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
- <!-- specify the interceptors, in order -->
- <property name="org.jboss.soa.esb.registry.interceptors"
- value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
- <!-- The following properties modify the cache interceptor behaviour -->
- <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
- <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
-
- <!-- Organization Category to be used by this deployment. -->
- <property name="org.jboss.soa.esb.registry.orgCategory"
- value="org.jboss.soa.esb.:category"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass"
+ value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+
+ <property name="org.jboss.soa.esb.registry.factoryClass"
+ value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+
+ <property name="org.jboss.soa.esb.registry.queryManagerURI"
+ value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
+ value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI"
+ value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
+
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass"
+ value="org.apache.ws.scout.transport.LocalTransport"/>
+ <!-- specify the interceptors, in order -->
+ <property name="org.jboss.soa.esb.registry.interceptors"
+ value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
+ <!-- The following properties modify the cache interceptor behaviour -->
+ <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
+ <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
+
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory"
+ value="org.jboss.soa.esb.:category"/>
</properties>
Modified: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/ms/interface.java
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/ms/interface.java 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/ms/interface.java 2010-08-09 09:57:59 UTC (rev 34600)
@@ -1,12 +1,20 @@
public interface MessageStore
{
public MessageURIGenerator getMessageURIGenerator();
- public URI addMessage (Message message, String classification) throws MessageStoreException;
- public Message getMessage (URI uid) throws MessageStoreException;
- public void setUndelivered(URI uid) throws MessageStoreException;
- public void setDelivered(URI uid) throws MessageStoreException;
- public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException;
- public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException;
- public Message getMessage (URI uid, String classification) throws MessageStoreException;
- public int removeMessage (URI uid, String classification) throws MessageStoreException;
+ public URI addMessage (Message message, String classification)
+ throws MessageStoreException;
+ public Message getMessage (URI uid)
+ throws MessageStoreException;
+ public void setUndelivered(URI uid)
+ throws MessageStoreException;
+ public void setDelivered(URI uid)
+ throws MessageStoreException;
+ public Map<URI, Message> getUndeliveredMessages(String classification)
+ throws MessageStoreException;
+ public Map<URI, Message> getAllMessages(String classification)
+ throws MessageStoreException;
+ public Message getMessage (URI uid, String classification)
+ throws MessageStoreException;
+ public int removeMessage (URI uid, String classification)
+ throws MessageStoreException;
}
Modified: labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/security/securityservice.xmlt
===================================================================
--- labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/security/securityservice.xmlt 2010-08-09 08:22:53 UTC (rev 34599)
+++ labs/jbossesb/trunk/product/docs/Services_Guide/en-US/extras/security/securityservice.xmlt 2010-08-09 09:57:59 UTC (rev 34600)
@@ -1,6 +1,7 @@
<service category="Security" name="SimpleListenerSecured">
- <security moduleName="messaging" runAs="adminRole"
- rolesAllowed="adminRole, normalUsers" callbackHandler="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler">
+ <security moduleName="messaging" runAs="adminRole"
+ rolesAllowed="adminRole, normalUsers"
+ callbackHandler="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler">
<property name="property1" value="value1"/>
<property name="property2" value="value2"/>
</security>
More information about the jboss-svn-commits
mailing list