[jboss-svn-commits] JBL Code SVN: r10285 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/internal/soa/esb/dependencies and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 16 16:40:56 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-03-16 16:40:56 -0400 (Fri, 16 Mar 2007)
New Revision: 10285
Removed:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesService.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesServiceMBean.java
labs/jbossesb/trunk/product/install/jboss-service-registry.xml
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/trunk/product/install/jboss-service.xml
Log:
Moving all the code into 1 sar, now that we no longer need scoping. Fixing the deploy task by hooking it up to the build.sar task
in the build-distr.xml.
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/build-distr.xml 2007-03-16 20:40:56 UTC (rev 10285)
@@ -94,13 +94,12 @@
</fileset>
</copy>
-
-
<mkdir dir="${build.dir}/jbossesb.sar/lib" />
<copy todir="${build.dir}/jbossesb.sar/lib">
<fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
- <fileset dir="${build.lib.dir}" includes="jbossesb*.jar"
- excludes="jbossesb-registry.jar" />
+ <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" />
+ <!-- scout -->
+ <fileset dir="${lib.ext.dir}" includes="scout-1.0-SNAPSHOT.jar"/>
<!-- xbean for reading/marchalling xml for configuration, and scout -->
<fileset dir="${lib.ext.dir}" includes="xbean.jar,stax-api-1.0.1.jar,xmlpublic.jar"/>
<!-- jUDDI Registry -->
@@ -115,18 +114,6 @@
<fileset dir="${lib.ext.dir}" includes="edtftpj.jar"/>
</copy>
- <delete dir="${build.dir}/jbossesb-registry.sar" />
- <mkdir dir="${build.dir}/jbossesb-registry.sar" />
- <mkdir dir="${build.dir}/jbossesb-registry.sar/META-INF" />
- <copy todir="${build.dir}/jbossesb-registry.sar">
- <!-- jaxr and scout -->
- <fileset dir="${lib.ext.dir}" includes="jaxr-api-1.0-SNAPSHOT.jar,
- scout-1.0-SNAPSHOT.jar"/>
- <fileset dir="${build.lib.dir}" includes="jbossesb-registry.jar"/>
- </copy>
- <copy file="${installation.files.dir}/jboss-service-registry.xml"
- tofile="${build.dir}/jbossesb-registry.sar/META-INF/jboss-service.xml"/>
-
</target>
</project>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/build.xml 2007-03-16 20:40:56 UTC (rev 10285)
@@ -375,7 +375,9 @@
</target>
<target name="deploy" depends="jar">
- <ant dir="install" target="deploy"/>
+ <ant antfile="build-distr.xml" target="build.sar" />
+ <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy">
+ <fileset dir="build" includes="jbossesb.sar/**"/></copy>
</target>
<target name="instr-report">
Deleted: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesService.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesService.java 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesService.java 2007-03-16 20:40:56 UTC (rev 10285)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * 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.internal.soa.esb.dependencies;
-
-import org.apache.log4j.Logger;
-import org.jboss.system.ServiceMBeanSupport;
-/**
- * An 'empty' service to
- *
- * @author Kurt Stam
- *
- */
-public class JBossESBDependenciesService extends ServiceMBeanSupport implements JBossESBDependenciesServiceMBean
-{
- private Logger log = Logger.getLogger(this.getClass());
- /**
- * Let's the jbossesb classloader know that the de
- */
- protected void startService() throws Exception
- {
- log.info("The JBossESB dependencies are deployed.");
- }
- /**
- * Stops the gateways.
- */
- protected void stopService() throws Exception
- {
- log.info("Undeploying the JBossESB dependencies..");
- }
-}
Deleted: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesServiceMBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesServiceMBean.java 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JBossESBDependenciesServiceMBean.java 2007-03-16 20:40:56 UTC (rev 10285)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * 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.internal.soa.esb.dependencies;
-
-import org.jboss.system.ServiceMBean;
-/**
- *
- * @author Kurt Stam
- *
- */
-public interface JBossESBDependenciesServiceMBean extends ServiceMBean
-{
-}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-03-16 20:40:56 UTC (rev 10285)
@@ -3,18 +3,12 @@
import java.io.File;
import java.net.URI;
import java.net.URL;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import javax.naming.InitialContext;
-import javax.sql.DataSource;
import org.apache.juddi.registry.rmi.JNDIRegistration;
import org.apache.log4j.Logger;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.soa.esb.listeners.config.Configuration;
public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
{
@@ -36,9 +30,9 @@
protected void startService() throws Exception
{
logger.info("starting juddi RMI service");
- URL url = Thread.currentThread().getContextClassLoader().getResource(propertiesResourcePath);
- URI uri = new URI(url.toString());
- File confFile = new File(uri);
+ URL url = Thread.currentThread().getContextClassLoader().getResource(propertiesResourcePath);
+ URI uri = new URI(url.toString());
+ File confFile = new File(uri);
System.setProperty("juddi.propertiesFile", confFile.toString());
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
JNDIRegistration.register();
Deleted: labs/jbossesb/trunk/product/install/jboss-service-registry.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service-registry.xml 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/install/jboss-service-registry.xml 2007-03-16 20:40:56 UTC (rev 10285)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <mbean code="org.jboss.internal.soa.esb.services.registry.JAXRRegistryService"
- name="jboss.esb:service=ESBRegistry">
- <depends>jboss.esb:service=JBossESBDependencies</depends>
- </mbean>
- <loader-repository>
- org.jboss.soa.esb:loader=jbossesb.sar
- </loader-repository>
-</server>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service.xml 2007-03-16 20:34:31 UTC (rev 10284)
+++ labs/jbossesb/trunk/product/install/jboss-service.xml 2007-03-16 20:40:56 UTC (rev 10285)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
+ <mbean code="org.jboss.internal.soa.esb.services.registry.JAXRRegistryService"
+ name="jboss.esb:service=ESBRegistry">
+ </mbean>
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
name="jboss.esb:service=JuddiDatabaseInitialization">
<attribute name="Datasource">java:/juddiDB</attribute>
@@ -20,19 +23,13 @@
</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
</mbean>
- <mbean code="org.jboss.internal.soa.esb.dependencies.JBossESBDependenciesService"
- name="jboss.esb:service=JBossESBDependencies"
- description="Container for the JBossESB Dependencies">
- </mbean>
<mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService"
name="jboss.esb:service=JuddiRMI"
description="Juddi RMI Service">
- <depends>jboss.esb:service=JBossESBDependencies</depends>
<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
</mbean>
<mbean code="org.jboss.soa.esb.listeners.config.JBoss4ESBDeployer"
name="jboss.esb:service=ESBDeployer">
- <depends>jboss.esb:service=JBossESBDependencies</depends>
<depends>jboss.esb:service=ESBRegistry</depends>
<depends>jboss.esb:service=JuddiRMI</depends>
<depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
More information about the jboss-svn-commits
mailing list