[jboss-svn-commits] JBL Code SVN: r14402 - in labs/jbossesb/trunk: product/install and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 21 00:40:17 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-08-21 00:40:17 -0400 (Tue, 21 Aug 2007)
New Revision: 14402
Added:
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/repository.xml
Removed:
labs/jbossesb/trunk/product/install/conf/repository.xml
labs/jbossesb/trunk/product/install/data/
labs/jbossesb/trunk/product/install/deploy/
labs/jbossesb/trunk/product/install/message-store/
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/install/standalone/jbossesb-server-base.zip
labs/jbossesb/trunk/product/lib/ext/jboss-messaging-client.jar
labs/jbossesb/trunk/qa/lib/ext/jboss-messaging-client.jar
Log:
JBESB-677, moving to jbossas-4.2.1.GA
JBESB-571, using jbossws-2.0.0.GA and jboss-messaging-1.4CR1
Moving messagestore related files to jbossesb.esb
Removing outdated files.
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2007-08-21 03:44:38 UTC (rev 14401)
+++ labs/jbossesb/trunk/product/build-distr.xml 2007-08-21 04:40:17 UTC (rev 14402)
@@ -108,14 +108,10 @@
<fileset dir="${installation.files.dir}/conf">
<include name="jbossesb-properties.xml"/>
<include name="esb.juddi.properties"/>
- <include name="repository.xml"/>
</fileset>
<fileset dir="${installation.files.dir}/jUDDI-registry">
<include name="juddi-ds.xml"/>
</fileset>
- <fileset dir="${installation.files.dir}/message-store">
- <include name="message-store-ds.xml"/>
- </fileset>
</copy>
<mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
@@ -139,15 +135,13 @@
<fileset dir="${lib.ext.dir}"
includes="opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar,stringtemplate-3.0.jar,antlr-2.7.6.jar"/>
<!-- ftp -->
- <fileset dir="${lib.ext.dir}" includes="edtftpj-*.jar"/>
- <!-- JCR repository -->
- <fileset dir="${lib.ext.dir}" includes="jcr-*.jar,jackrabbit-*.jar,commons-io-*.jar,lucene-*.jar"/>
+ <fileset dir="${lib.ext.dir}" includes="edtftpj-*.jar,commons-io*.jar"/>
<!-- XStream jars - including woodstox for the StaxDriver -->
<fileset dir="${lib.ext.dir}" includes="xstream-*.jar,wstx-lgpl-*.jar"/>
<!-- JBossCache jars - including jgroups -->
<fileset dir="${lib.ext.dir}" includes="cache.jar,jgroups-all.jar"/>
- <!-- Quartz -->
- <fileset dir="${lib.ext.dir}" includes="quartz-*.jar"/>
+ <!-- MVEL -->
+ <fileset dir="${lib.ext.dir}" includes="mvel*.jar"/>
</copy>
</target>
Deleted: labs/jbossesb/trunk/product/install/conf/repository.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/repository.xml 2007-08-21 03:44:38 UTC (rev 14401)
+++ labs/jbossesb/trunk/product/install/conf/repository.xml 2007-08-21 04:40:17 UTC (rev 14402)
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN"
- "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
-<Repository>
- <!--
- virtual file system where the repository stores global state
- (e.g. registered namespaces, custom node types, etc.)
- -->
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/repository"/>
- </FileSystem>
-
- <!--
- security configuration
- -->
- <Security appName="Jackrabbit">
- <!--
- access manager:
- class: FQN of class implementing the AccessManager interface
- -->
- <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager">
- <!-- <param name="config" value="${rep.home}/access.xml"/> -->
- </AccessManager>
-
- <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
- <!-- anonymous user name ('anonymous' is the default value) -->
- <param name="anonymousId" value="anonymous"/>
- </LoginModule>
- </Security>
-
- <!--
- location of workspaces root directory and name of default workspace
- -->
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
- <!--
- workspace configuration template:
- used to create the initial workspace if there's no workspace yet
- -->
- <Workspace name="${wsp.name}">
- <!--
- virtual file system of the workspace:
- class: FQN of class implementing FileSystem interface
- -->
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${wsp.home}"/>
- </FileSystem>
- <!--
- persistence of the workspace:
- class: FQN of class implementing PersistenceManager interface
- -->
- <PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
- <!--
- Search index and the file system it uses.
- -->
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${wsp.home}/index"/>
- </SearchIndex>
- </Workspace>
-
- <!--
- Configures the versioning
- -->
- <Versioning rootPath="${rep.home}/version">
- <!--
- Configures the filesystem to use for versioning for the respective
- persistence manager
- -->
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/version"/>
- </FileSystem>
-
- <!--
- Configures the persistence manager to be used for persisting version state.
- Please note that the current versioning implementation is based on
- a 'normal' persistence manager, but this could change in future
- implementations.
- -->
- <PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
-
- </Versioning>
-
-
- <!--
- Search index for content that is shared repository wide
- (/jcr:system tree, contains mainly versions)
-
- The same parameters are supported as in the search index configuration
- inside the workspace definition element.
-
- This element is optional. If omitted, the /jcr:system tree will not be
- indexed and no results will be returned for that tree!
- -->
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${rep.home}/repository/index"/>
- </SearchIndex>
-</Repository>
Modified: labs/jbossesb/trunk/product/install/standalone/jbossesb-server-base.zip
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml (from rev 14349, labs/jbossesb/trunk/product/install/message-store/message-store-ds.xml)
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml 2007-08-21 04:40:17 UTC (rev 14402)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>JBossESBDS</jndi-name>
+ <!-- use for in-process db
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}JBossESBDS</connection-url>
+ -->
+ <!-- use for server mode (over tcp) -->
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:9001/</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <!-- use for in-process db
+ <depends>jboss:service=Hypersonic,database=JBossESBDS</depends>
+ -->
+ <!-- use for server mode (over tcp) -->
+ <depends>jboss:service=Hypersonic,database=jbossesb</depends>
+ </local-tx-datasource>
+ <!-- use for in-process db
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=JBossESBDS">
+ <attribute name="Database">JBossESBDS</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+ -->
+ <!-- use for server mode (over tcp) -->
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=jbossesb">
+ <attribute name="Port">9001</attribute>
+ <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="Silent">true</attribute>
+ <attribute name="Database">jbossesb</attribute>
+ <attribute name="Trace">false</attribute>
+ <attribute name="No_system_exit">true</attribute>
+ </mbean>
+</datasources>
Copied: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/repository.xml (from rev 14349, labs/jbossesb/trunk/product/install/conf/repository.xml)
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/repository.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/repository.xml 2007-08-21 04:40:17 UTC (rev 14402)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
+<Repository>
+ <!--
+ virtual file system where the repository stores global state
+ (e.g. registered namespaces, custom node types, etc.)
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/repository"/>
+ </FileSystem>
+
+ <!--
+ security configuration
+ -->
+ <Security appName="Jackrabbit">
+ <!--
+ access manager:
+ class: FQN of class implementing the AccessManager interface
+ -->
+ <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager">
+ <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+ </AccessManager>
+
+ <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+ <!-- anonymous user name ('anonymous' is the default value) -->
+ <param name="anonymousId" value="anonymous"/>
+ </LoginModule>
+ </Security>
+
+ <!--
+ location of workspaces root directory and name of default workspace
+ -->
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+ <!--
+ workspace configuration template:
+ used to create the initial workspace if there's no workspace yet
+ -->
+ <Workspace name="${wsp.name}">
+ <!--
+ virtual file system of the workspace:
+ class: FQN of class implementing FileSystem interface
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${wsp.home}"/>
+ </FileSystem>
+ <!--
+ persistence of the workspace:
+ class: FQN of class implementing PersistenceManager interface
+ -->
+ <PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
+ <!--
+ Search index and the file system it uses.
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ </SearchIndex>
+ </Workspace>
+
+ <!--
+ Configures the versioning
+ -->
+ <Versioning rootPath="${rep.home}/version">
+ <!--
+ Configures the filesystem to use for versioning for the respective
+ persistence manager
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version"/>
+ </FileSystem>
+
+ <!--
+ Configures the persistence manager to be used for persisting version state.
+ Please note that the current versioning implementation is based on
+ a 'normal' persistence manager, but this could change in future
+ implementations.
+ -->
+ <PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
+
+ </Versioning>
+
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
+</Repository>
Modified: labs/jbossesb/trunk/qa/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list