[jboss-cvs] JBossAS SVN: r103018 - in projects/profileservice/trunk/domain/src: main/java/org/jboss/profileservice/domain/resources and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 26 05:00:15 EDT 2010
Author: scott.stark at jboss.org
Date: 2010-03-26 05:00:14 -0400 (Fri, 26 Mar 2010)
New Revision: 103018
Added:
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java
projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java
projects/profileservice/trunk/domain/src/test/resources/parsing/resources.xml
Modified:
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java
projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml
Log:
Add a jdbc resource
Modified: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java 2010-03-26 08:48:19 UTC (rev 103017)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java 2010-03-26 09:00:14 UTC (rev 103018)
@@ -31,6 +31,7 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import org.jboss.profileservice.domain.resources.JdbcResource;
import org.jboss.profileservice.domain.spi.DomainFeatureNode;
import org.jboss.profileservice.domain.spi.DomainMetaData;
import org.jboss.profileservice.domain.threadpool.IThreadPool;
@@ -47,7 +48,7 @@
normalizeSpace=true,
replacePropertyRefs=true)
@XmlRootElement(name = "domain")
- at XmlType(name = "domainType", propOrder = {"server", "threadPools", "features"})
+ at XmlType(name = "domainType", propOrder = {"server", "jdbcResources", "threadPools", "features"})
public class AbstractDomainMetaData implements DomainMetaData
{
@@ -59,6 +60,7 @@
/** The thread pools of the domain. */
private List<IThreadPool> threadPools;
+ private List<JdbcResource> jdbcResources;
/** The elements of the domain. */
private List<DomainFeatureNode> features;
@@ -84,7 +86,7 @@
*
* @return the server meta data
*/
- @XmlElement
+ @XmlElement(namespace=DomainMetaData.SERVER_NAMESPACE)
public ServerMetaData getServer()
{
return server;
@@ -95,7 +97,18 @@
this.server = server;
}
- @XmlElement(name="thread-pools")
+ @XmlElementWrapper(name="jdbc-resources")
+ @XmlElement(name="jdbc-resource", namespace=DomainMetaData.THREAD_POOL_NAMESPACE)
+ public List<JdbcResource> getJdbcResources()
+ {
+ return jdbcResources;
+ }
+ public void setJdbcResources(List<JdbcResource> jdbcResources)
+ {
+ this.jdbcResources = jdbcResources;
+ }
+
+ @XmlElement(name="thread-pools", namespace=DomainMetaData.THREAD_POOL_NAMESPACE)
public List<IThreadPool> getThreadPools()
{
return threadPools;
Added: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java (rev 0)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java 2010-03-26 09:00:14 UTC (rev 103018)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.profileservice.domain.resources;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class JdbcResource
+{
+ private String jndiName;
+ private String poolName;
+ private boolean enabled;
+
+ @XmlAttribute(name="jndi-name")
+ public String getJndiName()
+ {
+ return jndiName;
+ }
+ public void setJndiName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+ @XmlAttribute(name="pool-name")
+ public String getPoolName()
+ {
+ return poolName;
+ }
+ public void setPoolName(String poolName)
+ {
+ this.poolName = poolName;
+ }
+ @XmlAttribute(name="enabled")
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+ public void setEnabled(boolean enabled)
+ {
+ this.enabled = enabled;
+ }
+
+
+}
Added: projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java (rev 0)
+++ projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java 2010-03-26 09:00:14 UTC (rev 103018)
@@ -0,0 +1,50 @@
+package org.jboss.test.profileservice.domain.parsing.test;
+
+import java.net.URL;
+
+import org.jboss.profileservice.domain.AbstractDomainMetaData;
+import org.jboss.profileservice.domain.ServerMetaData;
+import org.jboss.profileservice.domain.spi.DomainMetaData;
+import org.jboss.profileservice.domain.threadpool.BasicThreadPoolMetaData;
+import org.jboss.test.BaseTestCase;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
+
+public class DomainUnitTestCase extends BaseTestCase
+{
+ /** The schema resolver. */
+ private static final MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+
+ static
+ {
+ addSchemaBinding(DomainMetaData.DOMAIN_NAMESPACE, AbstractDomainMetaData.class);
+ // initialize the schema binding
+ addSchemaBinding(DomainMetaData.SERVER_NAMESPACE, ServerMetaData.class);
+ addSchemaBinding(DomainMetaData.THREAD_POOL_NAMESPACE, BasicThreadPoolMetaData.class);
+ }
+ protected static void addSchemaBinding(String nsUri, Class<?> clazz)
+ {
+ resolver.mapURIToClass(nsUri, clazz);
+ }
+ static URL findResource(String name)
+ {
+ return Thread.currentThread().getContextClassLoader().getResource(name);
+ }
+
+ public DomainUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testDomainParsing()
+ throws Exception
+ {
+ super.enableTrace("org.jboss.xb.builder");
+ URL domain = findResource("parsing/domain.xml");
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ Object md = unmarshaller.unmarshal(domain.openStream(), resolver);
+ DomainMetaData domainMD = DomainMetaData.class.cast(md);
+ }
+}
Modified: projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml 2010-03-26 08:48:19 UTC (rev 103017)
+++ projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml 2010-03-26 09:00:14 UTC (rev 103018)
@@ -6,29 +6,27 @@
<domain xmlns="urn:jboss:profileservice:domain:1.0"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <management-domain name="domain1" connect-to-domain="true" />
- <jboss-server name="server1">
- <system>
+ <server name="server1" xmlns="urn:jboss:profileservice:server:1.0">
<properties>
- <property />
- <property />
+ <property name="timeout">3000</property>
+ <!-- Enable EAR classloader isolation. -->
+ <property name="classloaderIsolation">true</property>
</properties>
- <!-- Enable EAR classloader isolation. -->
- <ear-classloader-isolation>true</ear-classloader-isolation>
- <!-- The graceful shutdown configuration -->
- <shutdown>
- <graceful-timeout>3600000</graceful-timeout>
- </shutdown>
- </system>
- </jboss-server>
+ <shutdown-timeout>3600000</shutdown-timeout>
+ </server>
- <thread-pools>
+ <jdbc-resources>
+ <jdbc-resource jndi-name="jdbc/TimerPool" pool-name="TimerPool" enabled="true"/>
+ </jdbc-resources>
+
+ <thread-pools xmlns="urn:jboss:profileservice:thread-pool:1.0">
<thread-pool name="JBossDefaultThreadPool" />
</thread-pools>
- <xi:include href="resources.xml"/>
+ <!-- xi:include href="resources.xml"/ -->
- <!-- The jboss.web server configuration -->
+ <features>
+ <!-- The jboss.web server configuration -->
<web-server thread-pool="JBossDefaultThreadPool">
<!-- HTTP/1.1 connector -->
<connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}"
@@ -40,5 +38,6 @@
keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
keystorePass="rmi+ssl" sslProtocol = "TLS" />
</web-server>
+ </features>
</domain>
\ No newline at end of file
Added: projects/profileservice/trunk/domain/src/test/resources/parsing/resources.xml
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/parsing/resources.xml (rev 0)
+++ projects/profileservice/trunk/domain/src/test/resources/parsing/resources.xml 2010-03-26 09:00:14 UTC (rev 103018)
@@ -0,0 +1,2 @@
+<resources>
+</resources>
More information about the jboss-cvs-commits
mailing list