[jboss-cvs] JBossAS SVN: r90016 - in branches/dml-log-service-integration: cluster/src/main/org/jboss/ha/framework/server and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 9 19:41:25 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-09 19:41:24 -0400 (Tue, 09 Jun 2009)
New Revision: 90016
Removed:
branches/dml-log-service-integration/varia/build-test.xml
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/DuplicateServiceException.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ElementServiceBindingValueSource.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/InetAddressServiceBindingValueSource.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/IntServiceBindingValueSource.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/NoSuchBindingException.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBinding.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManager.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManagerMBean.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingStore.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingValueSource.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/StringServiceBindingValueSource.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinder.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinding.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/URLServiceBindingValueSource.java
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/impl/
branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/managed/
branches/dml-log-service-integration/varia/src/tests/
Modified:
branches/dml-log-service-integration/build/build.xml
branches/dml-log-service-integration/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
branches/dml-log-service-integration/component-matrix/pom.xml
branches/dml-log-service-integration/server/pom.xml
branches/dml-log-service-integration/server/src/etc/conf/all/jboss-log4j.xml
branches/dml-log-service-integration/testsuite/.classpath
branches/dml-log-service-integration/testsuite/build.xml
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
branches/dml-log-service-integration/thirdparty/pom.xml
branches/dml-log-service-integration/varia/.classpath
branches/dml-log-service-integration/varia/build.xml
branches/dml-log-service-integration/varia/pom.xml
Log:
Merge from trunk: -r89992:90015
Modified: branches/dml-log-service-integration/build/build.xml
===================================================================
--- branches/dml-log-service-integration/build/build.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/build/build.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1340,10 +1340,6 @@
<mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
- <!-- copy the service binding manager jar to it's deployment -->
- <copy file="${varia.module.output}/jboss-as-varia-jboss-bindingservice.jar"
- tofile="${install.all.conf}/bindingservice.beans/jboss-bindingservice.jar"/>
-
<!-- Copy to docs/examples -->
<mkdir dir="${install.examples.varia}"/>
<copy todir="${install.examples.varia}" filtering="no">
Modified: branches/dml-log-service-integration/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- branches/dml-log-service-integration/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1855,6 +1855,41 @@
this.kernelControllerContext = null;
}
+ // ManagedObject interface for lifecycle ----------------------------------
+
+
+ @ManagementOperation(description="Create the HAPartition",
+ impact=Impact.WriteOnly)
+ @Override
+ public void create() throws Exception
+ {
+ super.create();
+ }
+
+ @ManagementOperation(description="Start the HAPartition",
+ impact=Impact.WriteOnly)
+ @Override
+ public void start() throws Exception
+ {
+ super.start();
+ }
+
+ @ManagementOperation(description="Stop the HAPartition",
+ impact=Impact.WriteOnly)
+ @Override
+ public void stop()
+ {
+ super.stop();
+ }
+
+ @ManagementOperation(description="Destroy the HAPartition",
+ impact=Impact.WriteOnly)
+ @Override
+ public void destroy()
+ {
+ super.destroy();
+ }
+
// ManagedObject interface for DRM ---------------------------------------
@ManagementOperation(description="List all known DistributedReplicantManager keys and the nodes that have registered bindings",
@@ -1863,7 +1898,7 @@
{
return this.replicantManager == null ? null : this.replicantManager.listContent();
}
-
+
@ManagementOperation(description="List in XML format all known DistributedReplicantManager keys and the nodes that have registered bindings",
impact=Impact.ReadOnly)
public String listDRMContentAsXml() throws Exception
Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -87,6 +87,7 @@
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
<version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
<version.org.jboss.security>2.1.0.20090318</version.org.jboss.security>
+ <version.org.jboss.service.binding>1.0.0.CR1</version.org.jboss.service.binding>
<version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
<version.org.jboss.vfs>2.1.0.GA</version.org.jboss.vfs>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
@@ -1878,6 +1879,18 @@
<artifactId>jboss-negotiation</artifactId>
<version>${version.org.jboss.security.negotiation}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-core</artifactId>
+ <version>${version.org.jboss.service.binding}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-mgmt</artifactId>
+ <version>${version.org.jboss.service.binding}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.threads</groupId>
Modified: branches/dml-log-service-integration/server/pom.xml
===================================================================
--- branches/dml-log-service-integration/server/pom.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/server/pom.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -240,6 +240,16 @@
<include name="**/*"/>
</fileset>
</copy>
+
+ <!-- copy the service binding manager jars to their deployment -->
+ <property name="thirdparty.dir" location="../thirdparty"/>
+
+ <copy todir="target/etc/conf/all/bindingservice.beans">
+ <fileset dir="${thirdparty.dir}/org/jboss/service/binding/lib">
+ <include name="jboss-service-binding-core.jar"/>
+ <include name="jboss-service-binding-mgmt.jar"/>
+ </fileset>
+ </copy>
<!-- SQLException Processor -->
<copy todir="target"
Modified: branches/dml-log-service-integration/server/src/etc/conf/all/jboss-log4j.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/all/jboss-log4j.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/server/src/etc/conf/all/jboss-log4j.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -172,10 +172,236 @@
</appender>
-->
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
+ <!-- =============================================== -->
+ <!-- Limit categories -->
+ <!-- After enabling "trace" at root logger level, -->
+ <!-- also enable "trace" for the limit category -->
+ <!-- =============================================== -->
+ <category name="org.jboss.web">
+ <priority value="INFO" />
+ </category>
+
+ <category name="com.arjuna">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.tm">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.jdbc">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.on">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.services">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.bootstrap">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.kernel">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.beans">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.injection">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.annotation">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.system">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.mx">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.jmx">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.invocation">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.classloader">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.classloading">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.deployment">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.deployers">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.dependency">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.metadata">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.detailed">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.logging">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.logbridge">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.aop">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.joinpoint">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.util">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.ha">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.resource">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.varia">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.net">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.security">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.console">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.wsf">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.ajax4jsf">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.ejb">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.ejb3">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.jpa">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.virtual">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.xb">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.naming">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.wsf">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.ws">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.mail">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.monitor">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.profileservice">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.cache">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.proxy">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.jms">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.messaging">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.webbeans">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.managed">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.ajax4jsf">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jnp">
+ <priority value="INFO" />
+ </category>
+
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache">
<priority value="INFO"/>
@@ -232,6 +458,26 @@
<priority value="INFO"/>
</category>
+ <!-- Limit the verbose facelets compiler -->
+ <category name="facelets.compiler">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose ajax4jsf cache initialization -->
+ <category name="org.ajax4jsf.cache">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose embedded jopr categories -->
+ <category name="org.rhq">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose seam categories -->
+ <category name="org.jboss.seam">
+ <priority value="WARN"/>
+ </category>
+
<!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
<category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
<priority value="TRACE"/>
Modified: branches/dml-log-service-integration/testsuite/.classpath
===================================================================
--- branches/dml-log-service-integration/testsuite/.classpath 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/testsuite/.classpath 2009-06-09 23:41:24 UTC (rev 90016)
@@ -79,8 +79,8 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.6.GA/jboss-logging-log4j-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.6.GA/jboss-logging-log4j-2.0.6.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.Beta2/jboss-managed-2.1.1.Beta2.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.Beta2/jboss-managed-2.1.1.Beta2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.Beta2/jboss-metatype-2.1.1.Beta2.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.Beta2/jboss-metatype-2.1.1.Beta2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA-sources.jar"/>
@@ -93,6 +93,8 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.1.0.20090318/jboss-security-spi-2.1.0.20090318.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.1.0.20090318/jboss-security-spi-2.1.0.20090318-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.1.0.20090318/jbosssx-2.1.0.20090318.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.1.0.20090318/jbosssx-2.1.0.20090318-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.1.0.20090318/jbosssx-client-2.1.0.20090318.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.1.0.20090318/jbosssx-client-2.1.0.20090318-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/service/binding/jboss-service-binding-core/1.0.0.CR1/jboss-service-binding-core-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/service/binding/jboss-service-binding-core/1.0.0.CR1/jboss-service-binding-core-1.0.0.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/service/binding/jboss-service-binding-mgmt/1.0.0.CR1/jboss-service-binding-mgmt-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/service/binding/jboss-service-binding-mgmt/1.0.0.CR1/jboss-service-binding-mgmt-1.0.0.CR1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/1.1.0.GA/jbossws-common-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-common/1.1.0.GA/jbossws-common-1.1.0.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.1.2.GA/jbossws-spi-1.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.1.2.GA/jbossws-spi-1.1.2.GA-sources.jar"/>
Modified: branches/dml-log-service-integration/testsuite/build.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/build.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/testsuite/build.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -162,6 +162,7 @@
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.integration.classpath"/>
<path refid="jboss.profileservice.spi.classpath"/>
+ <path refid="org.jboss.service.binding.classpath"/>
<path refid="stax.api.classpath"/>
<!-- needed for messaging JMS provider tests -->
<path refid="jboss.messaging.classpath"/>
Modified: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -22,10 +22,8 @@
package org.jboss.test.cluster.defaultcfg.test;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
-import java.util.Set;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -155,10 +153,20 @@
val = ((SimpleValue) result).getValue();
assertTrue(val instanceof Boolean);
- // FIXME test for service lifecycle
+ mgdop = operations.get("create");
+ assertNotNull("HAPartition has create", mgdop);
- assertEquals("Correct number of operations", 8, operations.size());
+ mgdop = operations.get("start");
+ assertNotNull("HAPartition has start", mgdop);
+ mgdop = operations.get("stop");
+ assertNotNull("HAPartition has stop", mgdop);
+
+ mgdop = operations.get("destroy");
+ assertNotNull("HAPartition has destroy", mgdop);
+
+ assertEquals("Correct number of operations", 12, operations.size());
+
for (Map.Entry<String, ManagedProperty> entry : mc.getProperties().entrySet())
{
getLog().debug(entry.getKey() + " == " + entry.getValue());
Modified: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1546,6 +1546,14 @@
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-mgmt</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: branches/dml-log-service-integration/varia/.classpath
===================================================================
--- branches/dml-log-service-integration/varia/.classpath 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/.classpath 2009-06-09 23:41:24 UTC (rev 90016)
@@ -137,7 +137,8 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.1.2.GA/jbossws-spi-1.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.1.2.GA/jbossws-spi-1.1.2.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR2/jbossxacml-2.0.3.CR2.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR2/jbossxacml-2.0.3.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/service/binding/jboss-service-binding-core/1.0.0.CR1/jboss-service-binding-core-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/service/binding/jboss-service-binding-core/1.0.0.CR1/jboss-service-binding-core-1.0.0.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.10.GA/jgroups-2.6.10.GA.jar" sourcepath="M2_REPO/jgroups/jgroups/2.6.10.GA/jgroups-2.6.10.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA-sources.jar"/>
Deleted: branches/dml-log-service-integration/varia/build-test.xml
===================================================================
--- branches/dml-log-service-integration/varia/build-test.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/build-test.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
-]>
-
-<!-- $Id$ -->
-
-<project default="main" name="JBoss/System Tests">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
- -->
-
- &buildmagic;
-
- <!--
- | Include the normal targets.
- -->
- &targets;
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
-
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
- <property name="javac.deprecation" value="false" />
- <property name="javac.target" value="5" />
- <property name="javac.source" value="5" />
-
- <target name="configure" unless="configure.disable">
-
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="varia" />
- <property name="source.java" value="${module.source}/tests" />
- <property name="build.classes" value="${module.output}/classes-tests" />
- <property name="build.test.lib" value="${module.output}/test-lib"
- description="Separate lib directory for source.test classes"/>
- <property name="build.testlog" value="${module.output}/log" />
- <property name="build-bypass.disabled" value="true" />
- <property name="build.gen.test" value="${module.output}/gen-test"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- &libraries;
-
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
- <path refid="sun.jaxb.classpath"/>
- <path refid="jboss.web.classpath"/>
- <path refid="apache.bsf.classpath"/>
- <path refid="apache.commons.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.velocity.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="hsqldb.hsqldb.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="beanshell.beanshell.classpath"/>
- <path refid="opennms.joesnmp.classpath"/>
- <path refid="opensaml.opensaml.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="juddi.juddi.classpath"/>
- <path refid="jboss.metadata.classpath"/>
- <path refid="jboss.jboss.deployers.classpath"/>
- <path refid="jboss.jboss.man.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="org.jboss.ws.native.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.integration.classpath"/>
- <path refid="jboss.jboss.vfs.classpath"/>
- <path refid="jboss.test.classpath" />
- <path refid="junit.junit.classpath"/>
- </path>
-
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
-
- &modules;
- <!-- this -->
- <property name="jboss.this.root" value="${module.root}/output" />
- <property name="jboss.this.lib" value="${jboss.this.root}/lib" />
- <path id="jboss.this.classpath">
- <fileset dir="${jboss.this.lib}">
- <include name="*.jar" />
- <exclude name="run.jar" />
- </fileset>
- </path>
-
- <!-- The combined dependant module classpath -->
- <path id="dependentmodule.classpath">
- <path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.jmx.classpath"/>
- <path refid="jboss.bootstrap.classpath"/>
- <path refid="jboss.cluster.classpath"/>
- <path refid="jboss.main.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.jnpserver.classpath"/>
- <path refid="jboss.server.classpath"/>
- <path refid="jboss.jbosssx.classpath"/>
- <pathelement location="output/classes" />
- </path>
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <call target="_default:task-init" />
-
- <path id="thirdparty.classpath">
- <path refid="library.classpath" />
- <path refid="dependentmodule.classpath" />
- </path>
-
- </target>
- <patternset id="compile-resources.pattern">
- <include name="${src.resources}/**" />
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" description="Compile all source files."
- depends="_default:compile-classes, _default:compile-resources" />
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <target name="module-jars">
- <!-- Build jboss-varia-test.jar -->
- <jar jarfile="${build.lib}/jboss-varia-test.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}"/>
- <fileset dir="${build.resources}/tests">
- <include name="org/**"/>
- </fileset>
- </jar>
- </target>
-
- <!-- ================================================================== -->
- <!-- Tests -->
- <!-- ================================================================== -->
-
- <target name="tests" depends="most"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${module.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <syspropertyset id="jbosstest-properties">
- <propertyref prefix="jbosstest" />
- </syspropertyset>
-
- <classpath>
- <pathelement location="${build.classes}" />
- <pathelement location="${build.resources}/tests" />
- <path refid="javac.classpath" />
- <path refid="apache.xerces.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" />
- <formatter type="xml" usefile="true" />
-
- <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
-
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/**/*TestCase.class" />
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="one-test" depends="init"
- description="Execute the test defined by ${test}">
- <mkdir dir="${build.reports}" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${module.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <syspropertyset id="jbosstest-properties">
- <propertyref prefix="jbosstest" />
- </syspropertyset>
-
- <classpath>
- <pathelement location="${build.classes}" />
- <pathelement location="${build.resources}/tests" />
- <path refid="thirdparty.classpath" />
- <path refid="apache.xerces.classpath"/>
- </classpath>
-
- <formatter type="plain" usefile="true" />
- <formatter type="xml" usefile="true" />
-
- <test todir="${build.reports}" name="${test}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}" />
- </junit>
- </target>
-
-</project>
Modified: branches/dml-log-service-integration/varia/build.xml
===================================================================
--- branches/dml-log-service-integration/varia/build.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/build.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -450,14 +450,6 @@
<fileset dir="${build.resources}/jmx/examples/mbean-configurator-service"/>
</jar>
- <!-- jboss-bindingservice.jar -->
- <jar jarfile="${build.lib}/jboss-bindingservice.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/services/binding/**"/>
- </fileset>
- </jar>
-
<!-- jboss-monitoring.jar -->
<jar jarfile="${build.lib}/jboss-monitoring.jar"
manifest="${build.etc}/default.mf">
Modified: branches/dml-log-service-integration/varia/pom.xml
===================================================================
--- branches/dml-log-service-integration/varia/pom.xml 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/pom.xml 2009-06-09 23:41:24 UTC (rev 90016)
@@ -345,6 +345,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
</dependency>
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/DuplicateServiceException.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/DuplicateServiceException.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/DuplicateServiceException.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.services.binding;
-
-/**
- * DuplicateServiceException
- *
- * <p>Exception indicating that the add of a duplicate service was attempted.
- * (i.e. the service being added already exists in the config store, for the
- * given scope).
- *
- * @version $Revision$
- * @author <a href="mailto:bitpushr at rochester.rr.com">Mike Finn</a>.
- *
- */
-public class DuplicateServiceException
- extends java.lang.Exception
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 6008978514257402631L;
-
- public DuplicateServiceException(String serverName, ServiceBinding binding)
- {
- this(serverName, binding.getServiceName(), binding.getBindingName());
- }
-
- public DuplicateServiceException(String serverName, String serviceName, String bindingName)
- {
- this("Duplicate binding " + bindingName + " found for service " + serviceName + " in set " + serverName);
- }
-
- /**
- * Constructs an instance of <code>DuplicateServiceException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public DuplicateServiceException(String msg)
- {
- super(msg);
- }
-}
-
-
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ElementServiceBindingValueSource.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ElementServiceBindingValueSource.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ElementServiceBindingValueSource.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-import org.w3c.dom.Element;
-
-/**
- * A {@link ServiceBindingValueSource} that returns an Element.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface ElementServiceBindingValueSource extends ServiceBindingValueSource
-{
- /**
- * Returns the String to use for the binding value.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @return an String to use as the binding value. May return <code>null</code>.
- */
- Element getElementServiceBindingValue(ServiceBinding binding, Element input);
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/InetAddressServiceBindingValueSource.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/InetAddressServiceBindingValueSource.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/InetAddressServiceBindingValueSource.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-import java.net.InetAddress;
-
-/**
- * A {@link ServiceBindingValueSource} that returns an InetAddress. Typically used as
- * a source for a host binding value.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface InetAddressServiceBindingValueSource extends ServiceBindingValueSource
-{
- /**
- * Returns the InetAddress to use for the binding value.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @return an InetAddress to use as the binding value. May return <code>null</code>.
- */
- InetAddress getInetAddressServiceBindingValue(ServiceBinding binding);
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/IntServiceBindingValueSource.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/IntServiceBindingValueSource.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/IntServiceBindingValueSource.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-/**
- * A {@link ServiceBindingValueSource} that returns an int. Typically used as
- * a source for a port binding value.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface IntServiceBindingValueSource extends ServiceBindingValueSource
-{
- /**
- * Returns the int to use for the binding value.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @return an int to use as the binding value
- */
- int getIntServiceBindingValue(ServiceBinding binding);// throws Exception;
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/NoSuchBindingException.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/NoSuchBindingException.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/NoSuchBindingException.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-/**
- * Exception thrown by {@link ServiceBindingManager} when no binding
- * can be found that matches a binding request.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public class NoSuchBindingException extends Exception
-{
-
- /** The serialVersionUID */
- private static final long serialVersionUID = -9055052272112983527L;
-
- public NoSuchBindingException(String serverName, String serviceName, String bindingName)
- {
- this("No binding " + bindingName + " found for service " + serviceName + " in set " + serverName);
- }
-
- public NoSuchBindingException(String msg)
- {
- super(msg);
- }
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBinding.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBinding.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBinding.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,366 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.services.binding;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-
-/**
- * A ServiceBinding is a {name,virtualHost,port,interfaceAddress}
- * quad specifying a named binding for a service.
- *
- * @author <a href="mailto:bitpushr at rochester.rr.com">Mike Finn</a>.
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class ServiceBinding implements Comparable<ServiceBinding>
-{
-
- // ----------------------------------------------------------------- Fields
-
- /**
- * The name of the service to which the binding applies.
- */
- private final String serviceName;
-
- /**
- * The name of the binding. A null or empty name implies the default
- * binding for a service.
- */
- private final String bindingName;
-
- /** The bindingName, if any, concatenated to serviceName */
- private final String fullyQualifiedName;
-
- /** The virtual host name. This is the interface name used to
- construct the bindAddress value. A null value implies bind on any
- interface.
- */
- private final String hostName;
-
- /** The port the service should listen on. A 0 value implies an
- anonymous port.
- */
- private final int port;
-
- /** The interface on which the service should bind its listening port. A
- null address implies bind on any interface.
- */
- private final InetAddress bindAddress;
-
- /** Description of the binding that can be displayed by management tools */
- private String description;
-
- /** The ServiceBindingValueSource implementation class
- */
- private final String serviceBindingValueSourceClassName;
-
- /** The ServiceBindingValueSource
- */
- private final ServiceBindingValueSource serviceBindingValueSource;
-
- /** An aribtrary object used to configure the behavior of
- the ServiceBindingValueSource. An example would be an XML Element.
- */
- private final Object serviceBindingValueSourceConfig;
-
- // ----------------------------------------------------------- Constructors
-
- /**
- * Build a ServiceBinding from metadata.
- *
- * @param metadata the binding metadata. Cannot be <code>null</code>
- * @param defaultHostName host name to use if the metadata's hostname is not
- * {@link ServiceBindingMetadata#isFixedHostName() fixed}
- * @param portOffset offset to apply to the metadata port value if it is not
- * {@link ServiceBindingMetadata#isFixedPort() fixed}
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- *
- * @throws IllegalArgumentException if {@code metadata} is <code>null</code>ll
- * @throws IllegalStateException if metadata's {@code serviceName} is <code>null</code>
- * @throws RuntimeException if a {@code serviceBindingValueSourceClassName}
- * is provided but there is a problem instantiating
- * an instance of it via {@link Class#newInstance()}
- */
- public ServiceBinding(ServiceBindingMetadata metadata, String defaulHostName, int portOffset)
- throws UnknownHostException
- {
- if (metadata == null)
- {
- throw new IllegalArgumentException("metadata is null");
- }
-
- if (metadata.getServiceName() == null)
- {
- throw new IllegalStateException("metadata's serviceName is null");
- }
-
- this.serviceName = metadata.getServiceName();
- this.bindingName = metadata.getBindingName();
- this.fullyQualifiedName = (bindingName == null) ? serviceName : serviceName + ":" + bindingName;
- this.port = metadata.isFixedPort() ? metadata.getPort() : metadata.getPort() + portOffset;
- this.hostName = metadata.isFixedHostName() ? metadata.getHostName() : defaulHostName;
- this.bindAddress = InetAddress.getByName(this.hostName);
- this.description = metadata.getDescription();
-
- this.serviceBindingValueSourceConfig = metadata.getServiceBindingValueSourceConfig();
-
- ServiceBindingValueSource valueSource = metadata.getServiceBindingValueSource();
- if (valueSource == null)
- {
- this.serviceBindingValueSourceClassName = metadata.getServiceBindingValueSourceClassName();
- if (this.serviceBindingValueSourceClassName != null)
- {
- // Try and instantiate the value source
- try
- {
- this.serviceBindingValueSource = AccessController.doPrivileged(
- new PrivilegedExceptionAction<ServiceBindingValueSource>() {
-
- public ServiceBindingValueSource run() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class<?> delegateClass = loader.loadClass(serviceBindingValueSourceClassName);
- return (ServiceBindingValueSource) delegateClass.newInstance();
- }
- });
- }
- catch (RuntimeException e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw new RuntimeException("Failed creating ServiceBindingValueSource of type " +
- serviceBindingValueSourceClassName, e);
- }
- }
- else
- {
- // The standard case; just not configured at all
- this.serviceBindingValueSource = null;
- }
- }
- else
- {
- this.serviceBindingValueSource = valueSource;
- this.serviceBindingValueSourceClassName = valueSource.getClass().getName();
- }
-
- }
-
- // ------------------------------------------------------------- Properties
-
- /**
- * Gets the name of the service to which this binding applies.
- *
- * @return the name. Will not be <code>null</code>.
- */
- public String getServiceName()
- {
- return serviceName;
- }
-
- /**
- * Gets a qualifier identifying which particular binding within
- * {@link #getServiceName() the service} this is.
- *
- * @return the name, or <code>null</code> if this is an unnamed default binding
- * for the service.
- */
- public String getBindingName()
- {
- return this.bindingName;
- }
-
- /**
- * Gets the fully qualified binding name.
- *
- * @return the {@link #getServiceName() serviceName}:{@link #getBindingName() bindingName} or
- * just the service name if the binding name is <code>null</code>.
- */
- public String getFullyQualifiedName()
- {
- return fullyQualifiedName;
- }
-
- /**
- * Gets the host name or string notation IP address to use for the binding.
- *
- * @return the hostname or address
- */
- public String getHostName()
- {
- return this.hostName;
- }
-
- /**
- * Gets the port to use for the binding.
- *
- * @return The port
- */
- public int getPort()
- {
- return this.port;
- }
-
- /**
- * Gets the InetAddress of the interface to use for the binding.
- *
- * @return The binding address
- */
- public InetAddress getBindAddress()
- {
- return this.bindAddress;
- }
-
- /**
- * Gets a description of the binding suitable for display by management tools.
- *
- * @return the description, or <code>null</code> if there isn't one
- */
- public String getDescription()
- {
- return description;
- }
-
- /**
- * Sets a description of the binding suitable for display by management tools.
- *
- * @param description the description; may be <code>null</code>
- */
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- /**
- * Gets the object that can return this ServiceBinding's values in formats
- * usable by consumers. If unset (the norm), {@link ServiceBindingManager} will use
- * reasonable defaults based on the format requested by the consumer.
- *
- * @return the ServiceBindingValueSource; may be <code>null</code>
- */
- public synchronized ServiceBindingValueSource getServiceBindingValueSource()
- {
- return this.serviceBindingValueSource;
- }
-
- /**
- * Gets the fully qualified class name of the {@link #getServiceBindingValueSource() serviceBindingValueSource}.
- *
- * @return the binding value source class, or <code>null</code>
- */
- public String getServiceBindingValueSourceClassName()
- {
- return serviceBindingValueSourceClassName;
- }
-
- /**
- * Gets the configuration object the {@link #getServiceBindingValueSource() serviceBindingValueSource}
- * should use.
- *
- * @return the configuration object, or <code>null</code>
- */
- public Object getServiceBindingValueSourceConfig()
- {
- return serviceBindingValueSourceConfig;
- }
-
- // ------------------------------------------------------------- Comparable
-
- public int compareTo(ServiceBinding o)
- {
- return getFullyQualifiedName().compareTo(o.getFullyQualifiedName());
- }
-
- // -------------------------------------------------------------- Overrides
-
- /**
- * Equality is based on our serviceName and our bindingName.
- */
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
-
- if (obj instanceof ServiceBinding)
- {
- ServiceBinding other = (ServiceBinding) obj;
- return (this.serviceName.equals(other.serviceName)
- && safeEquals(this.bindingName, other.bindingName));
- }
-
- return false;
- }
-
- /**
- * Hashcode is based on our serviceName and our bindingName.
- */
- @Override
- public int hashCode()
- {
- int result = 19;
- result += 29 * this.serviceName.hashCode();
- result += 29 * (this.bindingName == null ? 0 : this.bindingName.hashCode());
- return result;
- }
-
- /**
- * Create string representation of the service descriptor
- *
- * @return String containing service descriptor properties
- */
- public String toString()
- {
- StringBuffer sBuf = new StringBuffer("ServiceBinding [serviceName=");
- sBuf.append(this.serviceName);
- sBuf.append(";bindingName=");
-
- sBuf.append(this.getBindingName());
- sBuf.append(";hostName=");
- String host = getHostName();
-
- if (hostName == null)
- {
- host = "<ANY>";
- }
- sBuf.append(host);
- sBuf.append(";bindAddress=");
- sBuf.append(this.getBindAddress().toString());
- sBuf.append(";port=");
- sBuf.append(this.getPort());
- sBuf.append("]");
- return sBuf.toString();
- }
-
- // ---------------------------------------------------------------- Private
-
- private boolean safeEquals(Object a, Object b)
- {
- return (a == b || (a != null && a.equals(b)));
- }
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManager.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManager.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManager.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,1109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.services.binding;
-
-
-import java.net.InetAddress;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Set;
-
-import org.jboss.services.binding.impl.SimpleServiceBindingValueSourceImpl;
-import org.jboss.services.binding.impl.StringReplacementServiceBindingValueSourceImpl;
-import org.jboss.services.binding.impl.Util;
-import org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig;
-import org.jboss.services.binding.impl.XSLTServiceBindingValueSourceImpl;
-import org.w3c.dom.Element;
-
-/**
- * The services configuration binding manager implementation.
- *
- * <p>The ServiceBindingManager enables the centralized management
- * of ports, by service. The port configuration store is abstracted out
- * using the ServiceBindingStore interface.
- *
- * @version $Revision$
- * @author <a href="mailto:bitpushr at rochester.rr.com">Mike Finn</a>
- * @author Scott.Stark at jboss.org
- * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
- * @author Brian Stansberry
- *
- * @jmx:mbean
- */
-public class ServiceBindingManager
- implements ServiceBindingManagerMBean
-{
- // ----------------------------------------------------------------- Static
-
- /** Enumeration of types of binding requests */
- public enum BindingType { INT, INETADDRESS, STRING, ELEMENT, URL, RESOURCE, GENERIC };
-
- /**
- * Algorithm for obtaining a {@link ServiceBindingValueSource} given a particular
- * binding and binding type.
- *
- * @param binding the binding
- * @param bindingType the binding type
- * @return the appropriate {@link ServiceBindingValueSource}. Will not return <code>null</code>.
- *
- * @throws ClassNotFoundException if any {@link ServiceBinding#getServiceBindingValueSourceClassName()} cannot be found
- * @throws InstantiationException if any {@link ServiceBinding#getServiceBindingValueSourceClassName()} cannot be instantiated
- * @throws IllegalAccessException if any {@link ServiceBinding#getServiceBindingValueSourceClassName()} is not public
- * @throws IllegalStateException if no appropriate ServiceBindingValueSource can be identified
- */
- public static ServiceBindingValueSource getServiceBindingValueSource(ServiceBinding binding, BindingType bindingType)
- {
- ServiceBindingValueSource source = binding.getServiceBindingValueSource();
- if (source == null)
- {
- switch (bindingType)
- {
- case INT:
- case INETADDRESS:
- source = new SimpleServiceBindingValueSourceImpl();
- break;
- case STRING:
- source = new StringReplacementServiceBindingValueSourceImpl();
- break;
- case ELEMENT:
- case URL:
- case RESOURCE:
- Object config = binding.getServiceBindingValueSourceConfig();
- if (config instanceof XSLTServiceBindingValueSourceConfig)
- {
- source = new XSLTServiceBindingValueSourceImpl();
- }
- else
- {
- source = new StringReplacementServiceBindingValueSourceImpl();
- }
- break;
- default:
- throw new IllegalStateException("No ServiceBindingValueSource configured for " +
- binding + " and no default source available for binding of type " +
- bindingType);
- }
- }
- return source;
- }
-
- // ---------------------------------------------------------------- Fields
-
- /**
- * The name of the config set this manager is associated with. This is a
- * logical name used to lookup ServiceBindings from the ServiceBindingStore.
- */
- private String serverName;
-
- /** The ServiceBindingStore instance */
- private final ServiceBindingStore store;
-
- // ----------------------------------------------------------- Constructors
-
- public ServiceBindingManager(String serverName, ServiceBindingStore store)
- {
- if (serverName == null)
- throw new IllegalArgumentException("serverName is null");
- if (store == null)
- throw new IllegalArgumentException("store is null");
-
- this.serverName = serverName;
- this.store = store;
- }
-
- // ------------------------------------------------------------- Properties
-
- /**
- * Gets the value of the <code>serverName</code> param this instance should pass
- * to <code>ServiceBindingStore</code> when
- * {@link ServiceBindingStore#getServiceBinding(String, String, String) requesting bindings}.
- *
- * @return name of the set of bindings this server uses
- *
- * @jmx:attribute
- */
- public String getServerName()
- {
- return this.serverName;
- }
-
- /**
- * Sets the value of the <code>serverName</code> param this instance should pass
- * to <code>ServiceBindingStore</code> when
- * {@link ServiceBindingStore#getServiceBinding(String, String, String) requesting bindings}.
- *
- * @return name of the set of bindings this server uses. Cannot be <code>null</code>
- *
- * @throws IllegalArgumentException if <code>serverName</code> is <code>null</code>
- */
- public void setServerName(String serverName)
- {
- if (serverName == null)
- {
- throw new IllegalArgumentException("serverName is null");
- }
- this.serverName = serverName;
- }
-
- public Set<ServiceBinding> getServiceBindings()
- {
- return this.store.getServiceBindings(this.serverName);
- }
-
- // ----------------------------------------------------------------- Public
-
- /**
- * Gets the <code>int</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getPort() port}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- *
- * @return the binding value as an <code>int</code>
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see IntServiceBindingValueSource
- */
- public int getIntBinding(String serviceName) throws NoSuchBindingException
- {
- return getIntBinding(serviceName, null);
- }
-
- /**
- * Gets the <code>int</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and <code>bindingName</code> qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getPort() port}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- *
- * @return the binding value as an <code>int</code>
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see IntServiceBindingValueSource
- */
- public int getIntBinding(String serviceName, String bindingName) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.INT);
- if (source instanceof IntServiceBindingValueSource)
- {
- return ((IntServiceBindingValueSource) source).getIntServiceBindingValue(binding);
- }
- else
- {
- return Util.getBindingValue(source, binding, Number.class).intValue();
- }
- }
-
- /**
- * Same as {@link #getIntBinding(String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- *
- * @return the binding value as an <code>int</code>
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public int getIntBinding(String serviceName, String bindingName,
- String hostName, int basePort) throws UnknownHostException, DuplicateServiceException
- {
- return getIntBinding(serviceName, bindingName, hostName, basePort, false, hostName != null);
- }
-
- /**
- * Same as {@link #getIntBinding(String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @return the binding value as an <code>int</code>
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public int getIntBinding(String serviceName, String bindingName,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- try
- {
- return getIntBinding(serviceName, bindingName);
- }
- catch (NoSuchBindingException e)
- {
- createBindingFromDefaults(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
-
- try
- {
- return getIntBinding(serviceName, bindingName);
- }
- catch (NoSuchBindingException e1)
- {
- // Shouldn't be possible
- throw new IllegalStateException("Newly created binding not found", e1);
- }
- }
- }
-
- /**
- * Gets the <code>InetAddress</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getBindAddress() bind address}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see InetAddressServiceBindingValueSource
- */
- public InetAddress getInetAddressBinding(String serviceName) throws NoSuchBindingException
- {
- return getInetAddressBinding(serviceName, null);
- }
-
- /**
- * Gets the <code>InetAddress</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and <code>bindingName</code> qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getBindAddress() bind address}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see InetAddressServiceBindingValueSource
- */
- public InetAddress getInetAddressBinding(String serviceName, String bindingName) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.INETADDRESS);
- if (source instanceof InetAddressServiceBindingValueSource)
- {
- return ((InetAddressServiceBindingValueSource) source).getInetAddressServiceBindingValue(binding);
- }
- else
- {
- return Util.getBindingValue(source, binding, InetAddress.class);
- }
- }
-
- /**
- * Same as {@link #getInetAddressBinding(String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- *
- * @return the binding value as an <code>InetAddress</code>
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public InetAddress getInetAddressBinding(String serviceName, String bindingName,
- String hostName, int basePort) throws UnknownHostException, DuplicateServiceException
- {
- return getInetAddressBinding(serviceName, bindingName, hostName, basePort, false, hostName != null);
- }
-
- /**
- * Same as {@link #getInetAddressBinding(String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @return the binding value as an <code>InetAddress</code>
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public InetAddress getInetAddressBinding(String serviceName, String bindingName,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- try
- {
- return getInetAddressBinding(serviceName, bindingName);
- }
- catch (NoSuchBindingException e)
- {
- createBindingFromDefaults(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
-
- try
- {
- return getInetAddressBinding(serviceName, bindingName);
- }
- catch (NoSuchBindingException e1)
- {
- // Shouldn't be possible
- throw new IllegalStateException("Newly created binding not found", e1);
- }
- }
- }
-
- /**
- * Gets the <code>String</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getHostName() host name}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- *
- * @return the raw binding value.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see StringServiceBindingValueSource
- */
- public String getStringBinding(String serviceName) throws NoSuchBindingException
- {
- return getStringBinding(serviceName, null, null);
- }
-
- /**
- * Gets the <code>String</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getHostName() host name}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- *
- * @return the raw binding value, or a transformed string based on the raw
- * binding value and <code>input</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see StringServiceBindingValueSource
- */
- public String getStringBinding(String serviceName, String input) throws NoSuchBindingException
- {
- return getStringBinding(serviceName, null, input);
- }
-
- /**
- * Gets the <code>String</code> binding value for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and <code>bindingName</code> qualifier.
- * <p>
- * This is typically the {@link ServiceBinding#getHostName() host name}.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- *
- * @return the raw binding value, or a transformed string based on the raw
- * binding value and <code>input</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see StringServiceBindingValueSource
- */
- public String getStringBinding(String serviceName, String bindingName, String input) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.STRING);
- if (source instanceof StringServiceBindingValueSource)
- {
- return ((StringServiceBindingValueSource) source).getStringServiceBindingValue(binding, input);
- }
- else
- {
- return Util.getBindingValueWithInput(source, binding, input, String.class);
- }
- }
-
- /**
- * Same as {@link #getStringBinding(String, String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- *
- * @return the raw binding value, or a transformed string based on the raw
- * binding value and <code>input</code>.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public String getStringBinding(String serviceName, String bindingName, String input,
- String hostName, int basePort) throws UnknownHostException, DuplicateServiceException
- {
- return getStringBinding(serviceName, bindingName, input, hostName, basePort, false, hostName != null);
- }
-
- /**
- * Same as {@link #getStringBinding(String, String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @return the raw binding value, or a transformed string based on the raw
- * binding value and <code>input</code>.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public String getStringBinding(String serviceName, String bindingName, String input,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- try
- {
- return getStringBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e)
- {
- createBindingFromDefaults(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
-
- try
- {
- return getStringBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e1)
- {
- // Shouldn't be possible
- throw new IllegalStateException("Newly created binding not found", e1);
- }
- }
- }
-
- /**
- * Gets an <code>Element</code> containing the binding values for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * Used to perform transformations on values embedded in DOM elements.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param input element that should be used as a source for transformations
- *
- * @return transformed element based on the raw binding value(s) and <code>input</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see ElementServiceBindingValueSource
- */
- public Element getElementBinding(String serviceName, Element input) throws NoSuchBindingException
- {
- return getElementBinding(serviceName, null, input);
- }
-
- /**
- * Gets an <code>Element</code> containing the binding values for the
- * <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and <code>bindingName</code> qualifier.
- * <p>
- * Used to perform transformations on values embedded in DOM elements.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input element that should be used as a source for transformations
- *
- * @return transformed element based on the raw binding value(s) and <code>input</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see ElementServiceBindingValueSource
- */
- public Element getElementBinding(String serviceName, String bindingName, Element input) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.ELEMENT);
- if (source instanceof ElementServiceBindingValueSource)
- {
- return ((ElementServiceBindingValueSource) source).getElementServiceBindingValue(binding, input);
- }
- else
- {
- return Util.getBindingValueWithInput(source, binding, input, Element.class);
- }
- }
-
- /**
- * Same as {@link #getElementBinding(String, String, Element)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- *
- * @return transformed element based on the raw binding value(s) and <code>input</code>.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public Element getElementBinding(String serviceName, String bindingName, Element input,
- String hostName, int basePort) throws UnknownHostException, DuplicateServiceException
- {
- return getElementBinding(serviceName, bindingName, input, hostName, basePort, false, hostName != null);
- }
-
- /**
- * Same as {@link #getElementBinding(String, String, Element)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @return transformed element based on the raw binding value(s) and <code>input</code>.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public Element getElementBinding(String serviceName, String bindingName, Element input,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- try
- {
- return getElementBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e)
- {
- createBindingFromDefaults(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
-
- try
- {
- return getElementBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e1)
- {
- // Shouldn't be possible
- throw new IllegalStateException("Newly created binding not found", e1);
- }
- }
- }
-
- /**
- * Gets a <code>URL</code> pointing to content that contains the binding values
- * for the <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * Typical usage is in file transformation operations, where the content
- * of the given <code>input</code> URL is read, transformed, written to a
- * temp file, and the URL of the temp file returned.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param input URL of content that should be used as a source for transformations
- *
- * @return URL pointing to the output of the transformation.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see URLServiceBindingValueSource
- */
- public URL getURLBinding(String serviceName, URL input) throws NoSuchBindingException
- {
- return getURLBinding(serviceName, null, input);
- }
-
- /**
- * Gets a <code>URL</code> pointing to content that contains the binding values
- * for the <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and <code>bindingName</code> qualifier.
- * <p>
- * Typical usage is in file transformation operations, where the content
- * of the given <code>input</code> URL is read, transformed, written to a
- * temp file, and the URL of the temp file returned.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input URL of content that should be used as a source for transformations
- *
- * @return URL pointing to the output of the transformation.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see URLServiceBindingValueSource
- */
- public URL getURLBinding(String serviceName, String bindingName, URL input) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.URL);
- if (source instanceof URLServiceBindingValueSource)
- {
- return ((URLServiceBindingValueSource) source).getURLServiceBindingValue(binding, input);
- }
- else
- {
- return Util.getBindingValueWithInput(source, binding, input, URL.class);
- }
- }
-
- /**
- * Same as {@link #getURLBinding(String, String, URL)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- *
- * @return URL pointing to the output of the transformation.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public URL getURLBinding(String serviceName, String bindingName, URL input,
- String hostName, int basePort) throws UnknownHostException, DuplicateServiceException
- {
- return getURLBinding(serviceName, bindingName, input, hostName, basePort, false, hostName != null);
- }
-
- /**
- * Same as {@link #getURLBinding(String, String, URL)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @return URL pointing to the output of the transformation.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public URL getURLBinding(String serviceName, String bindingName, URL input,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- try
- {
- return getURLBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e)
- {
- createBindingFromDefaults(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
-
- try
- {
- return getURLBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e1)
- {
- // Shouldn't be possible
- throw new IllegalStateException("Newly created binding not found", e1);
- }
- }
- }
-
- /**
- * Gets a filesystem path pointing to content that contains the binding values
- * for the <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and no binding name qualifier.
- * <p>
- * Typical usage is in file transformation operations, where the content
- * of the given <code>input</code> classpath resource is read, transformed, written to a
- * temp file, and the filesystem path of the temp file returned.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param input location of content that should be used as a source for transformations;
- * either a String representation of a URL or a value that
- * can be passed to {@link ClassLoader#getResourceAsStream(String)}.
- * Cannot be <code>null</code>.
- *
- * @return a filesystem path pointing to the output of the transformation.
- * May return <code>null</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see URLServiceBindingValueSource
- */
- public String getResourceBinding(String serviceName, String input) throws NoSuchBindingException
- {
- return getResourceBinding(serviceName, null, input);
- }
-
- /**
- * Gets a filesystem path pointing to content that contains the binding values
- * for the <code>ServiceBinding</code> with the given <code>serviceName</code>
- * and <code>bindingName</code> qualifier.
- * <p>
- * Typical usage is in file transformation operations, where the content
- * of the given <code>input</code> classpath resource is read, transformed, written to a
- * temp file, and the filesystem path of the temp file returned.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input location of content that should be used as a source for transformations;
- * either a String representation of a URL or a value that
- * can be passed to {@link ClassLoader#getResourceAsStream(String)}.
- * Cannot be <code>null</code>.
- *
- * @return a filesystem path pointing to the output of the transformation.
- * May return <code>null</code>.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see URLServiceBindingValueSource
- */
- public String getResourceBinding(String serviceName, String bindingName, String input) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.RESOURCE);
- if (source instanceof URLServiceBindingValueSource)
- {
- return ((URLServiceBindingValueSource) source).getResourceServiceBindingValue(binding, input);
- }
- else
- {
- return Util.getBindingValueWithInput(source, binding, input, String.class);
- }
- }
-
- /**
- * Same as {@link #getResourceBinding(String, String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- *
- * @return a filesystem path pointing to the output of the transformation.
- * May return <code>null</code>.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public String getResourceBinding(String serviceName, String bindingName, String input,
- String hostName, int basePort) throws UnknownHostException, DuplicateServiceException
- {
- return getResourceBinding(serviceName, bindingName, input, hostName, basePort, false, hostName != null);
- }
-
- /**
- * Same as {@link #getResourceBinding(String, String, String)} but, if no matching
- * service binding is found, creates a new one using the given
- * <code>hostName</code> and <code>basePort</code>.
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param input string that should be used as a source for transformations
- * (e.g. string replacement), or <code>null</code> if no
- * transformation is needed
- * @param hostName Host name to use for new service binding if one is
- * created.
- * @param basePort base port to use for the binding; ServiceBindingStore
- * may adjust this.
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @return a filesystem path pointing to the output of the transformation.
- * May return <code>null</code>.
- *
- * @throws DuplicateServiceException in unlikely event of concurrent attempts
- * to create same binding with different
- * binding values
- *
- * @throws UnknownHostException if no IP address for the <code>hostName</code> could be found
- */
- public String getResourceBinding(String serviceName, String bindingName, String input,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- try
- {
- return getResourceBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e)
- {
- createBindingFromDefaults(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
-
- try
- {
- return getResourceBinding(serviceName, bindingName, input);
- }
- catch (NoSuchBindingException e1)
- {
- // Shouldn't be possible
- throw new IllegalStateException("Newly created binding not found", e1);
- }
- }
- }
-
- /**
- * Gets the detyped binding value for the <code>ServiceBinding</code> with
- * the given <code>serviceName</code> and <code>bindingName</code> qualifier.
- * <p>
- * This method is an extension point to allow integration of custom
- * {@link ServiceBindingValueSource} implementations.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param params arbitrary parameters understood by the @{link {@link ServiceBindingValueSource}
- * associated with the binding.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see ServiceBinding#getServiceBindingValueSource()
- */
- public Object getGenericBinding(String serviceName, Object ... params) throws NoSuchBindingException
- {
- return getGenericBinding(serviceName, null, params);
- }
-
- /**
- * Gets the detyped binding value for the <code>ServiceBinding</code> with
- * the given <code>serviceName</code> and <code>bindingName</code> qualifier.
- * <p>
- * This method is an extension point to allow integration of custom
- * {@link ServiceBindingValueSource} implementations.
- * </p>
- *
- * @param serviceName value to match to {@link ServiceBinding#getServiceName()}
- * to identify the appropriate binding. Cannot be <code>null</code>.
- * @param bindingName value to match to {@link ServiceBinding#getBindingName()}
- * to identify the appropriate binding. May be <code>null</code>.
- * @param params arbitrary parameters understood by the @{link {@link ServiceBindingValueSource}
- * associated with the binding.
- *
- * @throws NoSuchBindingException if a matching ServiceBinding could not be found
- *
- * @see ServiceBinding#getServiceBindingValueSource()
- */
- public Object getGenericBinding(String serviceName, String bindingName, Object ... params) throws NoSuchBindingException
- {
- ServiceBinding binding = store.getServiceBinding(serverName, serviceName, bindingName);
- ServiceBindingValueSource source = getServiceBindingValueSource(binding, BindingType.GENERIC);
- return source.getServiceBindingValue(binding, params);
- }
-
- // ----------------------------------------------------------------- Private
-
- private void createBindingFromDefaults(String serviceName, String bindingName,
- String hostName, int basePort, boolean fixedPort, boolean fixedHostName) throws UnknownHostException, DuplicateServiceException
- {
- ServiceBindingMetadata md = new ServiceBindingMetadata(serviceName, bindingName, hostName, basePort, fixedPort, fixedHostName);
- store.addServiceBinding(getServerName(), md);
- }
-
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManagerMBean.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManagerMBean.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingManagerMBean.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.services.binding;
-
-
-/**
- * ServiceBindingManager StandardMBean interface
- *
- * @author <a href="mailto:bitpushr at rochester.rr.com">Mike Finn</a>
- * @author Scott.Stark at jboss.org
- * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
- * @author Brian Stansberry
- *
- * @version $Revision$
- */
-public interface ServiceBindingManagerMBean
-{
- // Attributes ----------------------------------------------------
-
- /**
- * The name of the server this manager is associated with. This is a
- * logical name used to lookup {@link ServiceBinding}s from the {@link ServiceBindingStore}.
- */
- String getServerName();
-
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,576 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * Metadata about a {@link ServiceBinding} that management tools can use. Does
- * not represent the runtime binding information, but rather the metadata
- * used to create the binding.
- *
- * @author Brian Stansberry
- */
-public class ServiceBindingMetadata implements Comparable<ServiceBindingMetadata>
-{
- /**
- * Checks if <code>serviceName</code> can be converted into an
- * ObjectName; if it can, converts it and returns its canonical form.
- *
- * @param serviceName the service name
- * @return the canonicalized form, or <code>serviceName</code> if it
- * cannot be converted into an ObjectName.
- */
- public static String canonicalizeServiceName(String serviceName)
- {
- // If the serviceName looks like an object name, canonicalize it
- try
- {
- ObjectName oname = new ObjectName(serviceName);
- return oname.getCanonicalName();
- }
- catch (MalformedObjectNameException e)
- {
- return serviceName;
- }
- }
-
- // ----------------------------------------------------------------- Fields
-
- /**
- * The name of the service to which the binding applies.
- */
- private String serviceName;
-
- /**
- * The name of the binding. A null or empty name implies the default
- * binding for a service.
- */
- private String bindingName;
-
- /** The virtual host name. This is the interface name used to
- construct the bindAddress value. A null value implies bind on any
- interface.
- */
- private String hostName;
-
- /** The port the service should listen on. A 0 value implies an
- anonymous port.
- */
- private int port;
-
- /** The ServiceBindingValueSource implementation class
- */
- private String serviceBindingValueSourceClassName;
-
- /** The ServiceBindingValueSource
- */
- private ServiceBindingValueSource serviceBindingValueSource;
-
- /** An aribtrary object used to configure the behavior of
- the ServiceBindingValueSource. An example would be an XML Element.
- */
- private Object serviceBindingValueSourceConfig;
-
- /**
- * Whether runtime @{link ServiceBinding}s created from this metadata
- * can alter the port value based on the server on which the binding
- * is running.
- */
- private boolean fixedPort;
-
- /**
- * Whether runtime @{link ServiceBinding}s created from this metadata
- * can alter the hostName value based on the server on which the binding
- * is running.
- */
- private Boolean fixedHostName;
-
- /** Description of the binding that can be displayed by management tools */
- private String description;
-
- // ------------------------------------------------------------ Constructors
-
- /**
- * Create a new ServiceBindingMetadata.
- */
- public ServiceBindingMetadata() {}
-
- /**
- * Create a new ServiceBindingMetadata with given service name.
- *
- * @param serviceName the name of the service to which this binding applies.
- * Cannot be <code>null</code>
- *
- * @throws IllegalArgumentException if {@code serviceName} is <code>null</code>
- */
- public ServiceBindingMetadata(String serviceName)
- {
- this(serviceName, null, null, 0, false, false);
- }
-
- /**
- * Create a new ServiceBindingMetadata with given service and binding names.
- *
- * @param serviceName the name of the service to which this binding applies.
- * Cannot be <code>null</code>
- * @param bindingName qualifier identifying which particular binding within
- * the service this is. May be <code>null</code>
- *
- * @throws IllegalArgumentException if {@code serviceName} is <code>null</code>
- */
- public ServiceBindingMetadata(String serviceName, String bindingName)
- {
- this(serviceName, bindingName, null, 0, false, false);
- }
-
- /**
- * Create a new ServiceBindingMetadata with given property values and a
- * non-fixed {@link #isFixedPort() port}. The
- * {@link #isFixedHostName() hostname is fixed} if the provided {@code hostName}
- * is not <code>null</code>.
- *
- * @param serviceName the name of the service to which this binding applies.
- * Cannot be <code>null</code>
- * @param bindingName qualifier identifying which particular binding within
- * the service this is. May be <code>null</code>
- * @param hostName the host name or string notation IP address of the
- * interface to bind to
- * @param port the port to bind to
- *
- * @throws IllegalArgumentException if {@code serviceName} is <code>null</code>
- */
- public ServiceBindingMetadata(String serviceName, String bindingName,
- String hostName, int port)
- {
- this(serviceName, bindingName, hostName, port, false, hostName != null);
- }
-
- /**
- * Create a new ServiceBindingMetadata with given property values.
- *
- * @param serviceName the name of the service to which this binding applies.
- * Cannot be <code>null</code>
- * @param bindingName qualifier identifying which particular binding within
- * the service this is. May be <code>null</code>
- * @param hostName the host name or string notation IP address of the
- * interface to bind to
- * @param port the port to bind to
- * @param fixedPort whether runtime @{link ServiceBinding}s created from this
- * metadata can alter the port value based on the server
- * on which the binding is running.
- * @param fixedHostName whether runtime @{link ServiceBinding}s created from
- * this metadata can alter the hostName value based on
- * the server on which the binding is running.
- *
- * @throws IllegalArgumentException if {@code serviceName} is <code>null</code>
- */
- public ServiceBindingMetadata(String serviceName, String bindingName,
- String hostName, int port, boolean fixedPort, boolean fixedHostName)
- {
- setServiceName(serviceName);
- setBindingName(bindingName);
- setHostName(hostName);
- setPort(port);
- setFixedPort(fixedPort);
- setFixedHostName(fixedHostName);
- }
-
- /**
- * Create a new ServiceBindingMetadata from a runtime ServiceBinding. The
- * resulting object has a fixed port and host name.
- *
- * @param binding the binding. Cannot be <code>null</code>
- */
- public ServiceBindingMetadata(ServiceBinding binding)
- {
- this(binding.getServiceName(), binding.getBindingName(),
- binding.getHostName(), binding.getPort(), true, true);
- setServiceBindingValueSource(binding.getServiceBindingValueSource());
- if (this.serviceBindingValueSourceClassName == null)
- {
- setServiceBindingValueSourceClassName(binding.getServiceBindingValueSourceClassName());
- }
- setServiceBindingValueSourceConfig(binding.getServiceBindingValueSourceConfig());
- }
-
- /**
- * Copy constructor.
- *
- * @param binding the metadata to copy. Cannot be <code>null</code>
- */
- public ServiceBindingMetadata(ServiceBindingMetadata binding)
- {
- this(binding.getServiceName(), binding.getBindingName(),
- binding.getHostName(), binding.getPort(), binding.isFixedHostName(), binding.isFixedPort());
- setServiceBindingValueSource(binding.getServiceBindingValueSource());
- if (this.serviceBindingValueSourceClassName == null)
- {
- setServiceBindingValueSourceClassName(binding.getServiceBindingValueSourceClassName());
- }
- setServiceBindingValueSourceConfig(binding.getServiceBindingValueSourceConfig());
- }
-
- // ------------------------------------------------------------ Properties
-
- /**
- * Gets the name of the service to which this binding applies.
- *
- * @return the name.
- */
- public String getServiceName()
- {
- return serviceName;
- }
-
- /**
- * Sets the name of the service to which this binding applies.
- *
- * @param serviceName the name. Cannot be <code>null</code>.
- *
- * @throws IllegalArgumentException if {@code serviceName} is <code>null</code>
- */
- public void setServiceName(String serviceName)
- {
- if (serviceName == null)
- {
- throw new IllegalArgumentException("serviceName is null");
- }
- this.serviceName = canonicalizeServiceName(serviceName);
- }
-
- /**
- * Gets a qualifier identifying which particular binding within
- * {@link #getServiceName() the service} this is.
- *
- * @return the name, or <code>null</code> if this is an unnamed default binding
- * for the service.
- */
- public String getBindingName()
- {
- return this.bindingName;
- }
-
- /**
- * Sets a qualifier identifying which particular binding within
- * {@link #getServiceName() the service} this is.
- *
- * @param bindingName the name, or <code>null</code> if this is an unnamed
- * default binding for the service.
- */
- public void setBindingName(String bindingName)
- {
- this.bindingName = bindingName;
- }
-
- /**
- * Gets the fully qualified binding name.
- *
- * @return the {@link #getServiceName() serviceName}:{@link #getBindingName() bindingName} or
- * just the service name if the binding name is <code>null</code>.
- *
- * @throws IllegalStateException if {@link #getServiceName() serviceName} is <code>null</code>
- */
- public String getFullyQualifiedName()
- {
- if (this.serviceName == null)
- {
- throw new IllegalStateException("Must set serviceName");
- }
- else if (this.bindingName == null)
- {
- return this.serviceName;
- }
- else
- {
- StringBuilder sb = new StringBuilder(this.serviceName);
- if (this.bindingName != null)
- {
- sb.append(':');
- sb.append(this.bindingName);
- }
-
- return sb.toString();
- }
- }
-
- /**
- * Gets the host name or string notation IP address to use for the binding.
- *
- * @return the hostname or address. May be <code>null</code>
- */
- public String getHostName()
- {
- return hostName;
- }
-
- /**
- * Sets the host name or string notation IP address to use for the binding.
- *
- * @param hostName the hostname or address. May be <code>null</code>
- */
- public void setHostName(String hostName)
- {
- this.hostName = hostName;
- // Assume that setting a host name means it's meant to be fixed
- if (this.fixedHostName == null)
- {
- setFixedHostName(hostName == null);
- }
- }
-
- public int getPort()
- {
- return port;
- }
-
- /**
- * Sets the port to use for the binding.
- *
- * @param port the port
- */
- public void setPort(int port)
- {
- this.port = port;
- }
-
- /**
- * Gets a description of the binding suitable for display by management tools.
- *
- * @return the description, or <code>null</code> if there isn't one
- */
- public String getDescription()
- {
- return description;
- }
-
- /**
- * Sets a description of the binding suitable for display by management tools.
- *
- * @param description the description; may be <code>null</code>
- */
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- /**
- * Gets the object that can return this ServiceBinding's values in formats
- * usable by consumers. If unset (the norm), {@link ServiceBindingManager} will use
- * reasonable defaults based on the format requested by the consumer.
- *
- * @return the ServiceBindingValueSource; may be <code>null</code>
- */
- public synchronized ServiceBindingValueSource getServiceBindingValueSource()
- {
- return this.serviceBindingValueSource;
- }
-
- /**
- * Sets the object that can return this ServiceBinding's values in formats
- * usable by consumers.
- *
- * @param serviceBindingValueSource the ServiceBindingValueSource; may be <code>null</code>
- */
- public void setServiceBindingValueSource(ServiceBindingValueSource serviceBindingValueSource)
- {
- this.serviceBindingValueSource = serviceBindingValueSource;
- if (serviceBindingValueSource != null)
- {
- setServiceBindingValueSourceClassName(serviceBindingValueSource.getClass().getName());
- }
- }
-
- /**
- * Gets the fully qualified class name of the {@link #getServiceBindingValueSource() serviceBindingValueSource}.
- *
- * @return the binding value source class, or <code>null</code>
- */
- public String getServiceBindingValueSourceClassName()
- {
- return serviceBindingValueSourceClassName;
- }
-
- /**
- * Sets the fully qualified class name of the {@link #getServiceBindingValueSource() serviceBindingValueSource}.
- *
- * @param serviceBindingValueSourceClassName the binding value source class, or <code>null</code>
- */
- public void setServiceBindingValueSourceClassName(String serviceBindingValueSourceClassName)
- {
- this.serviceBindingValueSourceClassName = serviceBindingValueSourceClassName;
- }
-
- /**
- * Gets the configuration object the {@link #getServiceBindingValueSource() serviceBindingValueSource}
- * should use.
- *
- * @return the configuration object, or <code>null</code>
- */
- public Object getServiceBindingValueSourceConfig()
- {
- return serviceBindingValueSourceConfig;
- }
-
- /**
- * Sets the configuration object the {@link #getServiceBindingValueSource() serviceBindingValueSource}
- * should use.
- *
- * @param serviceBindingValueSourceConfig the configuration object, or <code>null</code>
- */
- public void setServiceBindingValueSourceConfig(Object serviceBindingValueSourceConfig)
- {
- this.serviceBindingValueSourceConfig = serviceBindingValueSourceConfig;
- }
-
- /**
- * Gets whether runtime @{link ServiceBinding}s created from this metadata
- * can alter the port value based on the server on which the binding
- * is running.
- *
- * @return <code>true</code> if the {@link #getPort()} value from this
- * object must be respected; <code>false</code> if it can be
- * altered.
- */
- public boolean isFixedPort()
- {
- return fixedPort;
- }
-
- /**
- * Sets whether runtime @{link ServiceBinding}s created from this metadata
- * can alter the port value based on the server on which the binding
- * is running.
- *
- * param fixedPort <code>true</code> if the {@link #getPort()} value from this
- * object must be respected; <code>false</code> if it can be
- * altered.
- */
- public void setFixedPort(boolean fixedPort)
- {
- this.fixedPort = fixedPort;
- }
-
- /**
- * Gets whether runtime @{link ServiceBinding}s created from this metadata
- * can alter the hostName value based on the server on which the binding
- * is running.
- *
- * @return <code>true</code> if the {@link #getHostName()} value from this
- * object must be respected; <code>false</code> if it can be
- * altered.
- */
- public boolean isFixedHostName()
- {
- return (this.fixedHostName == null ? this.hostName != null : this.fixedHostName.booleanValue());
- }
-
- /**
- * Sets whether runtime @{link ServiceBinding}s created from this metadata
- * can alter the hostName value based on the server on which the binding
- * is running.
- *
- * param fixedHostName <code>true</code> if the {@link #getHostName()} value
- * from this object must be respected; <code>false</code>
- * if it can be altered.
- */
- public void setFixedHostName(boolean fixedHostName)
- {
- this.fixedHostName = Boolean.valueOf(fixedHostName);
- }
-
- // ------------------------------------------------------------- Comparable
-
- public int compareTo(ServiceBindingMetadata other)
- {
- return getFullyQualifiedName().compareTo(other.getFullyQualifiedName());
- }
-
- // -------------------------------------------------------------- Overrides
-
- /**
- * Equality is based on our serviceName and our bindingName.
- */
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
-
- if (obj instanceof ServiceBindingMetadata)
- {
- ServiceBindingMetadata other = (ServiceBindingMetadata) obj;
- return (this.serviceName != null && this.serviceName.equals(other.serviceName)
- && safeEquals(this.bindingName, other.bindingName));
- }
-
- return false;
- }
-
- /**
- * Hashcode is based on our serviceName and our bindingName.
- */
- @Override
- public int hashCode()
- {
- int result = 19;
- result += 29 * this.serviceName.hashCode();
- result += 29 * (this.bindingName == null ? 0 : this.bindingName.hashCode());
- return result;
- }
-
- /**
- * Create string representation of the service descriptor
- *
- * @return String containing service descriptor properties
- */
- public String toString()
- {
- StringBuffer sBuf = new StringBuffer("ServiceBindingMetadata [serviceName=");
- sBuf.append(this.serviceName);
- sBuf.append(";bindingName=");
-
- sBuf.append(this.getBindingName());
- sBuf.append(";hostName=");
- String host = getHostName();
-
- if (hostName == null)
- {
- host = "<ANY>";
- }
- sBuf.append(host);
- sBuf.append(";port=");
- sBuf.append(this.getPort());
- sBuf.append("]");
- return sBuf.toString();
- }
-
- // ---------------------------------------------------------------- Private
-
- private boolean safeEquals(Object a, Object b)
- {
- return (a == b || (a != null && a.equals(b)));
- }
-
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingStore.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingStore.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingStore.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,118 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.services.binding;
-
-import java.net.UnknownHostException;
-import java.util.Set;
-
-
-/**
- * SPI through which {@link ServiceBindingManager} interacts with a store
- * of service binding metadata.
- *
- * @version $Revision$
- * @author <a href="mailto:bitpushr at rochester.rr.com">Mike Finn</a>.
- * @author Scott.Stark at jboss.org
- * @author Brian Stansberry
- */
-public interface ServiceBindingStore
-{
- /**
- * Obtain a ServiceBinding object for the given server name, target
- * service and binding name.
- *
- * @param serverName the {@link ServiceBindingManager#getServerName() name identifying the server instance}
- * in which the service is running.
- * @param serviceName the name of the service
- * @param bindingName the name of the binding, or <code>null</code> to indicate
- * the default binding.
- * @return the ServiceBinding if one exists for the <serverName, serviceName, bindingName>
- * tuple.
- *
- * @throws NoSuchBindingException if no matching binding exists
- *
- * @throws IllegalArgumentException if serverName is unknown to the store.
- */
- ServiceBinding getServiceBinding(String serverName, String serviceName, String bindingName)
- throws NoSuchBindingException;
-
- /**
- * Gets all service bindings for the given server name.
- *
- * @param serverName the {@link ServiceBindingManager#getServerName() name identifying the server instance}
- * in which the service is running. Cannot be <code>null</code>.
- *
- * @return the set of service bindings for the server name. Will not be null.
- *
- * @throws IllegalArgumentException if serverName is unknown to the store.
- */
- Set<ServiceBinding> getServiceBindings(String serverName);
-
- /**
- * Add a ServiceBinding to the store for the given serverName.
- *
- * @param serverName the name identifying the JBoss server instance in
- * which the service is running.
- * @param binding metadata for the binding to add
- *
- * @throws DuplicateServiceException thrown if a configuration for the
- * <serverName, serviceName> pair already exists.
- * @throws UnknownHostException if the host specified by the metadata is unknown
- *
- * @throws IllegalArgumentException if serverName is unknown to the store.
- */
- void addServiceBinding(String serverName, ServiceBindingMetadata binding)
- throws DuplicateServiceException, UnknownHostException;
-
- /**
- * Remove a ServiceBinding from the store for the given serverName.
- *
- * @param serverName the name identifying the JBoss server instance in
- * which the service is running.
- * @param binding the binding
- *
- * @throws IllegalArgumentException if serverName is unknown to the store.
- */
- void removeServiceBinding(String serverName, ServiceBindingMetadata binding);
-
- /**
- * Gets the offset from a base value that by default should be added to
- * port values for a given serverName.
- *
- * @param serverName the name of the binding set
- * @return the offset
- *
- * @throws IllegalArgumentException if serverName is unknown to the store.
- */
- int getDefaultPortOffset(String serverName);
-
- /**
- * Gets the default value to use as the host name for the given serverName.
- *
- * @param serverName the name of the binding set
- * @return the host name
- *
- * @throws IllegalArgumentException if serverName is unknown to the store.
- */
- String getDefaultHostName(String serverName);
-
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingValueSource.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingValueSource.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/ServiceBindingValueSource.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.services.binding;
-
-
-/**
- * Source for a service binding value.
- *
- * @author Brian Stansberry
- */
-public interface ServiceBindingValueSource
-{
- /**
- * Returns a detyped binding value based on the provided binding
- * and detyped array of parameters.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @param params the parameters, or <code>null</code>
- *
- * @return the binding value. May return <code>null</code>
- *
- * @throws IllegalArgumentException if content of <code>params</code> is
- * not understood
- * @throws Exception if another exception occurs
- */
- public Object getServiceBindingValue(ServiceBinding binding, Object ... params);
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/StringServiceBindingValueSource.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/StringServiceBindingValueSource.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/StringServiceBindingValueSource.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-
-/**
- * A {@link ServiceBindingValueSource} that returns a String.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface StringServiceBindingValueSource extends ServiceBindingValueSource
-{
- /**
- * Returns the String to use for the binding value.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @param originalValue an unprocessed value to which transformation can be applied
- *
- * @return a String to use as the binding value. May return <code>null</code>.
- */
- String getStringServiceBindingValue(ServiceBinding binding, String input);
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinder.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinder.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinder.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Set;
-
-/**
- * Defines system properties for a given set of {@link SystemPropertyBinding}s
- * in its {@link #start()} phase, and clears them in its {@link #stop()} phase.
- * <p>
- * Intent is this service would be used as a utility to convert
- * {@link ServiceBindingManager} values into system properties so other
- * services could consume them without being aware of
- * <code>ServiceBindingManager</code>.
- * <p/>
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public class SystemPropertyBinder
-{
- private final Set<SystemPropertyBinding> bindings;
-
- public SystemPropertyBinder(Set<SystemPropertyBinding> bindings)
- {
- this.bindings = bindings;
- }
-
- public void start()
- {
- for (SystemPropertyBinding binding : bindings)
- {
- final String property = binding.getProperty();
- final String value = binding.getValue();
-
- if (System.getSecurityManager() == null)
- {
- System.setProperty(property, value);
- }
- else
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
-
- public Object run()
- {
- System.setProperty(property, value);
- return null;
- }
-
- });
- }
- }
-
- }
-
- public void stop()
- {
- for (SystemPropertyBinding binding : bindings)
- {
- final String property = binding.getProperty();
-
- if (System.getSecurityManager() == null)
- {
- System.clearProperty(property);
- }
- else
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
-
- public Object run()
- {
- System.clearProperty(property);
- return null;
- }
-
- });
- }
- }
- }
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinding.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinding.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/SystemPropertyBinding.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-import java.net.InetAddress;
-import java.net.URL;
-
-/**
- * Encapsulates the key and value for a system property. Basic function is to
- * perform type conversions in its constructor for values returned by
- * {@link ServiceBindingManager} so {@link SystemPropertyBinder} can bind the
- * values.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public class SystemPropertyBinding
-{
- private final String property;
- private final String value;
-
- public SystemPropertyBinding(String property, int value)
- {
- this(property, String.valueOf(value));
- }
-
- public SystemPropertyBinding(String property, InetAddress value)
- {
- this(property, value.getHostAddress());
- }
-
- public SystemPropertyBinding(String property, URL value)
- {
- this(property, value.toExternalForm());
- }
-
- public SystemPropertyBinding(String property, String value)
- {
- this.property = property;
- this.value = value;
- }
-
- public String getProperty()
- {
- return property;
- }
- public String getValue()
- {
- return value;
- }
-
-
-}
Deleted: branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/URLServiceBindingValueSource.java
===================================================================
--- branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/URLServiceBindingValueSource.java 2009-06-09 22:39:13 UTC (rev 90015)
+++ branches/dml-log-service-integration/varia/src/main/org/jboss/services/binding/URLServiceBindingValueSource.java 2009-06-09 23:41:24 UTC (rev 90016)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.services.binding;
-
-import java.net.URL;
-
-/**
- * A {@link ServiceBindingValueSource} that returns a URL or a String
- * representation of one.
- * <p>
- * Typical usage is in file transformation operations, where the content
- * of a given <code>input</code> URL or classpath resource is read,
- * transformed, written to a temp file, and the URL of the temp file returned.
- * </p>
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface URLServiceBindingValueSource extends ServiceBindingValueSource
-{
- /**
- * Returns the URL to use for the binding value.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @param input the URL to use as input data
- *
- * @return a URL to use as the binding value. Will not return <code>null</code>.
- */
- URL getURLServiceBindingValue(ServiceBinding binding, URL input);
-
- /**
- * Returns a String representation of a URL path to use for the binding value.
- *
- * @param binding the binding. Cannot be <code>null</code>
- * @param input either a String representation of a URL or a value that
- * can be passed to {@link ClassLoader#getResourceAsStream(String)}
- *
- * @return a filesystem path to use as the binding value. May return <code>null</code>.
- */
- String getResourceServiceBindingValue(ServiceBinding binding, String input);
-}
More information about the jboss-cvs-commits
mailing list