[jboss-cvs] JBossAS SVN: r81410 - in trunk: build and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 21 03:29:06 EST 2008
Author: scott.stark at jboss.org
Date: 2008-11-21 03:29:06 -0500 (Fri, 21 Nov 2008)
New Revision: 81410
Removed:
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java
trunk/profileservice/src/main/org/jboss/profileservice/mock/
trunk/system/src/main/org/jboss/deployers/plugins/managed/ControllerStateMetaType.java
trunk/system/src/main/org/jboss/deployers/spi/
trunk/system/src/main/org/jboss/profileservice/
Modified:
trunk/build/build-distr.xml
trunk/cluster/.classpath
trunk/cluster/build.xml
trunk/component-matrix/pom.xml
trunk/connector/.classpath
trunk/connector/build.xml
trunk/pom.xml
trunk/profileservice/.classpath
trunk/profileservice/.project
trunk/profileservice/build.xml
trunk/profileservice/pom.xml
trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java
trunk/system/.classpath
trunk/system/build.xml
trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
trunk/testsuite/.classpath
trunk/testsuite/build.xml
trunk/thirdparty/pom.xml
Log:
JBAS-6199, break out the profileservice-spi to integration
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/build/build-distr.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -403,7 +403,6 @@
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-system.jar"/>
- <include name="jboss-profileservice-spi.jar"/>
</fileset>
</copy>
@@ -1824,6 +1823,9 @@
<fileset dir="${jboss.integration.lib}">
<include name="jboss-classloading-spi.jar"/>
</fileset>
+ <fileset dir="${jboss.profileservice.spi.lib}">
+ <include name="jboss-profileservice-spi.jar"/>
+ </fileset>
<fileset dir="${jboss.jboss.reflect.lib}">
<include name="jboss-reflect.jar"/>
</fileset>
Modified: trunk/cluster/.classpath
===================================================================
--- trunk/cluster/.classpath 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/cluster/.classpath 2008-11-21 08:29:06 UTC (rev 81410)
@@ -10,7 +10,8 @@
<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-api.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-api-sources.jar"/>
<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-spi.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-spi-sources.jar"/>
<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc-sources.jar"/>
- <!--<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/jbosscache-core/src/main/java"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
+ <!--<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/jbosscache-core/src/main/java"/>
<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo-sources.jar"/>-->
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/cluster/build.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -103,6 +103,7 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.bootstrap.classpath"/>
+ <path refid="jboss.profileservice.spi.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.jnpserver.classpath"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/component-matrix/pom.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -70,7 +70,7 @@
<version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
<version.org.jboss.cluster.cache.spi>1.1.0.GA</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.cache.jbc>1.1.0.GA</version.org.jboss.cluster.cache.jbc>
- <version.org.jboss.integration>5.0.2.GA</version.org.jboss.integration>
+ <version.org.jboss.integration>5.0.3.GA</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
<version.org.jboss.metadata>1.0.0.CR6</version.org.jboss.metadata>
<version.org.jboss.naming>5.0.0.GA</version.org.jboss.naming>
@@ -1728,8 +1728,14 @@
<artifactId>jboss-kernel</artifactId>
<version>${version.org.jboss.microcontainer}</version>
</dependency>
-
+
<dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
<version>${version.org.jboss.security}</version>
Modified: trunk/connector/.classpath
===================================================================
--- trunk/connector/.classpath 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/connector/.classpath 2008-11-21 08:29:06 UTC (rev 81410)
@@ -15,5 +15,6 @@
<classpathentry kind="lib" path="/thirdparty/stax-api/lib/stax-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-man/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-managed-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/connector/build.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -86,10 +86,10 @@
<path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.jboss.reflect.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.profileservice.spi.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="sun.jaf.classpath"/>
- <path refid="jboss.integration.classpath"/>
<path refid="stax.api.classpath"/>
</path>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/pom.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -164,6 +164,7 @@
<module>iiop</module>
<module>aspects</module>
<module>profileservice</module>
+ <module>profileservice-spi</module>
<module>connector</module>
<module>management</module>
<module>ejb3</module>
Modified: trunk/profileservice/.classpath
===================================================================
--- trunk/profileservice/.classpath 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/profileservice/.classpath 2008-11-21 08:29:06 UTC (rev 81410)
@@ -4,7 +4,7 @@
<classpathentry kind="src" output="output/eclipse-test-classes" path="src/test/resources"/>
<classpathentry kind="src" output="output/eclipse-test-classes" path="src/test/main"/>
<classpathentry exported="true" kind="src" path="/aspects"/>
- <classpathentry exported="true" kind="src" path="/system"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
<classpathentry exported="true" kind="src" path="/system-jmx"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="/thirdparty/javax/xml/bind/lib/jaxb-api.jar"/>
Modified: trunk/profileservice/.project
===================================================================
--- trunk/profileservice/.project 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/profileservice/.project 2008-11-21 08:29:06 UTC (rev 81410)
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>profileservice</name>
- <comment></comment>
- <projects>
- <project>test</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>jboss-as-profileservice</name>
+ <comment>JBoss Application Server (profileservice module)</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: trunk/profileservice/build.xml
===================================================================
--- trunk/profileservice/build.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/profileservice/build.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -79,9 +79,8 @@
<path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.jboss.reflect.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.profileservice.spi.classpath"/>
<path refid="jboss.remoting.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="stax.api.classpath"/>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/profileservice/pom.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -28,10 +28,30 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-remoting-aspects</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-aspects</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
@@ -46,8 +66,8 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java 2008-11-21 08:29:06 UTC (rev 81410)
@@ -25,7 +25,6 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.deployers.plugins.managed.ControllerStateMetaType;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.registry.KernelBus;
@@ -33,6 +32,7 @@
import org.jboss.metatype.api.values.EnumValueSupport;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.MetaValueFactory;
+import org.jboss.profileservice.spi.types.ControllerStateMetaType;
/**
* Microcontainer KernelBus runtime component dispatcher.
Deleted: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java 2008-11-21 08:29:06 UTC (rev 81410)
@@ -1,155 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.management.templates;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.jboss.deployers.spi.management.DeploymentTemplate;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.managed.api.DeploymentTemplateInfo;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.profileservice.mock.ds.DataSourceDeployment;
-import org.jboss.profileservice.mock.ds.FakeDataSourceDeployer;
-import org.jboss.system.metadata.ServiceDeployment;
-import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * A template for creating a datasource(*-dsf.xml) deployments.
- *
- * @author Scott.Stark at jboss.org
- * @author adrian at jboss.org
- * @version $Revision:$
- */
-public class FakeDsXmlDataSourceTemplate
- implements DeploymentTemplate
-{
- /**
- * The managed property information
- */
- private DeploymentTemplateInfo info;
- /**
- * The deployer used to
- */
- private FakeDataSourceDeployer deployer;
- private Map<String, String> propertyNameMappings;
-
- public Map<String, String> getPropertyNameMappings()
- {
- return propertyNameMappings;
- }
-
- public void setPropertyNameMappings(Map<String, String> propertyNameMappings)
- {
- this.propertyNameMappings = propertyNameMappings;
- }
-
- public FakeDataSourceDeployer getDeployer()
- {
- return deployer;
- }
-
- public void setDeployer(FakeDataSourceDeployer deployer)
- {
- this.deployer = deployer;
- }
-
- /**
- * Creates a root/{deploymentBaseName}-dsf.xml base descriptor
- * with minimal fields containing default values.
- */
- public VirtualFile applyTemplate(VirtualFile root, String deploymentBaseName,
- DeploymentTemplateInfo values)
- throws Exception
- {
- String dsName = deploymentBaseName+"-dsf.xml";
- URI dsXmlURI = new URI(root.toURI()+dsName);
- File dsXml = new File(dsXmlURI.getPath());
- writeTemplate(dsXml, values);
- return root.findChild(dsName);
- }
- /**
- * Update the ctx with the metadata values that correspond to the
- * template info values.
- * @param ctx - the DeploymentContext to associate metadata to
- * @param values - the managed property values passed to apply.
- */
- public void updateTemplateDeployment(VFSDeployment ctx,
- DeploymentTemplateInfo values)
- throws Exception
- {
- // Add the -dsf.xml metadata
- ServiceDeployment service = new ServiceDeployment();
- ArrayList<ServiceMetaData> services = new ArrayList<ServiceMetaData>();
- DataSourceDeployment ds = new DataSourceDeployment();
- ds.parse(values.getProperties());
- ServiceMetaData dsMetaData = deployer.createDsServiceMetaData(ds);
- services.add(dsMetaData);
- service.setServices(services);
- /** TODO What is this?
- ctx.getTransientAttachments().addAttachment(ServiceDeployment.class, service);
- */
- }
-
- public DeploymentTemplateInfo getInfo()
- {
- return info;
- }
- public void setInfo(DeploymentTemplateInfo info)
- {
- this.info = info;
- }
-
- protected void writeTemplate(File dsXml, DeploymentTemplateInfo values)
- throws Exception
- {
- FileWriter fw = new FileWriter(dsXml);
- Map<String, ManagedProperty> properties = values.getProperties();
- ManagedProperty type = properties.get("datasource-type");
- String typeTag = "local-tx-datasource";
- if( type != null && type.getValue() != null )
- typeTag = type.getValue().toString();
-
- /* Write out a minimal template with the datasource type and
- some defaults. All other properties will be applied to the
- attachment metdata.
- */
- fw.write("<datasources>\n");
- fw.write("<"+typeTag+">\n");
- fw.write("<jndi-name>default</jndi-name>\n");
- fw.write("<connection-url>jdbc:...</connection-url>\n");
- fw.write("<driver-class>default</driver-class>\n");
- fw.write("<user-name>default</user-name>\n");
- fw.write("<password>default</password>\n");
- fw.write("<min-pool-size>1</min-pool-size>\n");
- fw.write("<max-pool-size>10</max-pool-size>\n");
- fw.write("<security-domain>default</security-domain>\n");
- fw.write("</"+typeTag+">\n");
- fw.write("</datasources>\n");
- fw.flush();
- fw.close();
- }
-}
Modified: trunk/system/.classpath
===================================================================
--- trunk/system/.classpath 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/system/.classpath 2008-11-21 08:29:06 UTC (rev 81410)
@@ -28,5 +28,6 @@
<classpathentry kind="lib" path="/thirdparty/stax-api/lib/stax-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/main"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/system/build.xml
===================================================================
--- trunk/system/build.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/system/build.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -82,6 +82,7 @@
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
+ <path refid="jboss.profileservice.spi.classpath"/>
<!-- TEMP for the temporary AOP Deployer -->
<path refid="javassist.javassist.classpath"/>
<!-- jaxb for attachment serialization -->
@@ -104,11 +105,6 @@
<property name="jar.prefix" value="jboss-system"/>
<property name="javac.target" value="1.5"/>
<property name="javac.source" value="1.5"/>
- <property name="ps.spi.includes"
- value="org/jboss/profileservice/**,
- org/jboss/deployers/spi/**
- "
- />
<property name="jar.client.includes"
value="org/jboss/system/Service.class,
**/*MBean.class"
@@ -156,10 +152,6 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/jboss-profileservice-spi.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}" includes="${ps.spi.includes}"/>
- </jar>
-
<jar jarfile="${build.lib}/${jar.client.name}" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}" includes="${jar.client.includes}"/>
</jar>
Deleted: trunk/system/src/main/org/jboss/deployers/plugins/managed/ControllerStateMetaType.java
===================================================================
--- trunk/system/src/main/org/jboss/deployers/plugins/managed/ControllerStateMetaType.java 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/system/src/main/org/jboss/deployers/plugins/managed/ControllerStateMetaType.java 2008-11-21 08:29:06 UTC (rev 81410)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.deployers.plugins.managed;
-
-import java.util.Arrays;
-
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.metatype.api.types.EnumMetaType;
-
-/**
- * An EnumMetaType for the kernel ControllerState values.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class ControllerStateMetaType extends EnumMetaType
-{
- private static final long serialVersionUID = 2;
- private static final String[] VALID_VALUES = {
- "**ERROR**",
- "Not Installed",
- "PreInstall",
- "Described",
- "Instantiated",
- "Configured",
- "Create",
- "Start",
- "Installed"
- };
- public static final EnumMetaType TYPE = new ControllerStateMetaType();
-
- private ControllerStateMetaType()
- {
- super(ControllerState.class.getName(), Arrays.asList(VALID_VALUES));
- }
-}
Modified: trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
===================================================================
--- trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java 2008-11-21 08:29:06 UTC (rev 81410)
@@ -49,6 +49,7 @@
import org.jboss.metatype.api.values.CollectionValueSupport;
import org.jboss.metatype.api.values.GenericValue;
import org.jboss.metatype.api.values.GenericValueSupport;
+import org.jboss.profileservice.spi.types.ControllerStateMetaType;
/**
* ManagedObjectCreator for KernelDeployment
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/testsuite/.classpath 2008-11-21 08:29:06 UTC (rev 81410)
@@ -45,6 +45,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy-client.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-aspects.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/profileservice"/>
<classpathentry kind="lib" path="/cluster/output/lib/jboss-ha-legacy-client.jar"/>
<classpathentry kind="lib" path="output/resources/security"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/testsuite/build.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -143,6 +143,7 @@
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.integration.classpath"/>
+ <path refid="jboss.profileservice.spi.classpath"/>
<path refid="stax.api.classpath"/>
<!-- needed for messaging JMS provider tests -->
<path refid="jboss.messaging.classpath"/>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-11-21 08:18:58 UTC (rev 81409)
+++ trunk/thirdparty/pom.xml 2008-11-21 08:29:06 UTC (rev 81410)
@@ -399,6 +399,13 @@
</mapping>
</dependency>
<dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <mapping>
+ <componentId>jboss.profileservice-spi</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-asintegration-core</artifactId>
<version>${version.org.jboss.aop}</version>
@@ -1385,6 +1392,10 @@
</dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list