Repository: zest-sandbox Updated Branches: refs/heads/develop c5da67d3b -> 707b73fe4
http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java b/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java deleted file mode 100644 index 963937a..0000000 --- a/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2010 Niclas Hedhman <[email protected]>. - * - * Licensed 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. - */ - -package org.qi4j.entitystore.voldemort; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.Random; -import org.qi4j.api.common.Visibility; -import org.qi4j.bootstrap.AssemblyException; -import org.qi4j.bootstrap.ModuleAssembly; -import org.qi4j.test.entity.AbstractEntityStoreTest; -import voldemort.server.VoldemortConfig; -import voldemort.server.VoldemortServer; - -public class VoldemortTest extends AbstractEntityStoreTest -{ - private List<VoldemortServer> servers = new ArrayList<VoldemortServer>(); - - @Override - public void setUp() - throws Exception - { - File voldemortHome1 = setupVoldemortHome(); - startServer( voldemortHome1, "node0.properties" ); - File voldemortHome2 = setupVoldemortHome(); - startServer( voldemortHome2, "node1.properties" ); - super.setUp(); - } - - @Override - public void tearDown() - throws Exception - { - super.tearDown(); - for( VoldemortServer server : servers ) - { - server.stop(); - } - } - - @Override - public void assemble( ModuleAssembly module ) - throws AssemblyException - { - super.assemble( module ); - new VoldemortAssembler( Visibility.layer ).assemble( module ); - } - - private File setupVoldemortHome() - throws IOException - { - File tmp = File.createTempFile( "qi4j", "" ); - File dir = tmp.getParentFile(); - File voldemortHome = new File( dir, "qi4j-voldemort" + new Random().nextInt( 1000 ) ); - boolean created = voldemortHome.mkdir(); - File configDir = new File( voldemortHome, "config" ); - created = configDir.mkdir(); - copyFile( "cluster.xml", configDir ); - copyFile( "stores.xml", configDir ); - return voldemortHome; - } - - private void startServer( File voldemortHome, String serverProps ) - throws IOException - { - Properties props = new Properties(); - InputStream in = getClass().getResourceAsStream( serverProps ); - props.load( in ); - props.setProperty( "voldemort.home", voldemortHome.getCanonicalPath() ); - VoldemortConfig config = new VoldemortConfig( props ); - VoldemortServer server = new VoldemortServer( config ); - server.start(); - this.servers.add( server ); - } - - private void copyFile( String source, File voldemortHome ) - throws IOException - { - InputStream in = getClass().getResourceAsStream( source ); - FileOutputStream out = new FileOutputStream( new File( voldemortHome, source ) ); - BufferedOutputStream stream = new BufferedOutputStream( out ); - int data = in.read(); - while( data != -1 ) - { - stream.write( data ); - data = in.read(); - } - in.close(); - stream.close(); - } - -} http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/cluster.xml ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/cluster.xml b/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/cluster.xml deleted file mode 100644 index cafc886..0000000 --- a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/cluster.xml +++ /dev/null @@ -1,38 +0,0 @@ -<!-- - ~ Copyright (c) 2010 Niclas Hedhman <[email protected]>. - ~ - ~ Licensed 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. - --> - -<cluster> - <!-- The name is just to help users identify this cluster from the gui --> - <name>qi4j-test-cluster</name> - <server> - <!-- The node id is a unique, sequential id beginning with 0 that identifies each server in the cluster--> - <id>0</id> - <host>localhost</host> - <http-port>8481</http-port> - <socket-port>8581</socket-port> - <!-- A list of data partitions assigned to this server --> - <partitions>0,1,2,3</partitions> - </server> - <server> - <id>1</id> - <host>localhost</host> - <http-port>8681</http-port> - <socket-port>8781</socket-port> - <partitions>4,5,6,7</partitions> - </server> -</cluster> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node0.properties ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node0.properties b/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node0.properties deleted file mode 100644 index f2b3a3b..0000000 --- a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node0.properties +++ /dev/null @@ -1,207 +0,0 @@ -# -# Copyright (c) 2010 Niclas Hedhman <[email protected]>. -# -# Licensed 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. -# - -# The unique, sequential identifier for this server in the cluster (starts with 0) -# default: none, must be specfified -node.id=0 - -# The base directory for voldemort. Can also be specified via the environment variable VOLDEMORT_HOME or -# via a command line option. -# default: none -# voldemort.home= - -# The directory where voldemort data is stored -# default: ${voldemort.home}/data -# data.directory= - - -# The directory where voldemort configuration is stored -# default: ${voldemort.home}/config -# metadata.directory= - -# Should the BDB engine be enabled? -# default: true -# enable.bdb.engine= - - -# The BDB cache that is shared by all BDB tables. Bigger is better. -# default: 200MB (make it bigger!!!) -bdb.cache.size=50000000 - - -# Should transactions be immediately written to disk? -# default: false -# bdb.write.transactions= - -# When the transaction has been written to disk should we force the disk to flush the OS cache. This is a fairly expensive operation. -# default: false -# bdb.flush.transactions= - - -# The directory where the BDB environment is located -# default: ${data.directory}/bdb -# bdb.data.directory= - - -# The size of an individual log file -# default: 1GB -# bdb.max.logfile.size= - - -# The fanout size for the btree. Bigger fanout more effienciently supports larger btrees. -# default: 512 -# bdb.btree.fanout= - - -# How often (in bytes) should we checkpoint the transaction log? Checkpoints make startup and shutdown faster. -# default: 20 * 1024 * 1024 -# bdb.checkpoint.interval.bytes= - - -# How often in ms should we checkpoint the transaction log -# default: 30000 -# bdb.checkpoint.interval.ms= - - -# Should we enabled the mysql storage engine? Doing so will create a connection pool that will be used for the mysql instance -# default: false -# enable.mysql.engine= - - -# The mysql username to user -# default: root -# mysql.user= - - -# The mysql password to user -# mysql.password= - - -# The host of the mysql instance -# default: localhost -# mysql.host= - - -# The port of the mysql instance -# default: 3306 -# mysql.port= - - -# The name of the mysql database -# default: voldemort -# mysql.database= - - -#Should we enable the memory storage engine? Might as well this takes no resources and is just here for consistency. -# default: true -# enable.memory.engine= - - -# Should we enable the cache storage engine? Might as well this takes no resources and is just here for consistency. -# default: true -# enable.cache.engine= - - -# Should we enable the readonly storage engine? -# default: false -# enable.readonly.engine= - - -# The maximum time to wait to acquire a filehandle to perform reads. -# default: 4000 -# readonly.file.wait.timeout.ms= - - -# The number of backup copies of the data to keep around for rollback. -# default: 1 -# readonly.backups= - - -# The number of file descriptors to pool per store. -# default: 5 -# readonly.file.handles= - - -# The directory in which to store readonly data files. -# default: ${data.directory}/read-only -# readonly.data.directory= - - -# What storage engine should we use for storing misdelivered messages that need to be rerouted? -# default: bdb -# slop.store.engine= - - -# The maximum number of threads the server can use. -# default: 100 -# max.threads= - - -# The number of threads to keep alive even when idle. -# default: max(1, ${max.threads} / 2) -# core.threads= - - -# The socket SO_TIMEOUT. Essentially the amount of time to block on a low-level network operation before throwing an error. -# default: 4000 -# socket.timeout.ms= - - -# The total amount of time to wait for adequate responses from all nodes before throwing an error. -# default: 5000 -# routing.timeout.ms= - - -# Enable the HTTP data server? -# default: true -# http.enable= - - -# Enable the socket data server? -# default: true -# socket.enable= - - -# Enable JMX monitoring? -# default: true -# jmx.enable= - - -# Enable detection of misdelivered messages for persistence and redelivery. -# default: false -# slop.detection.enable= - - -# Log every operation on all stores. -# default: true -# enable.verbose.logging= - - -# Track load statistics on the stores. -# default: true -# enable.stat.tracking= - - -# How often should misdelivered "slop" data be pushed out to nodes? -# default: 2 * 60 * 1000 -# pusher.poll.ms= - - -# The number of threads to use for scheduling periodic jobs -# default: 3 -# scheduler.threads= http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node1.properties ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node1.properties b/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node1.properties deleted file mode 100644 index a2081dd..0000000 --- a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/node1.properties +++ /dev/null @@ -1,207 +0,0 @@ -# -# Copyright (c) 2010 Niclas Hedhman <[email protected]>. -# -# Licensed 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. -# - -# The unique, sequential identifier for this server in the cluster (starts with 0) -# default: none, must be specfified -node.id=1 - -# The base directory for voldemort. Can also be specified via the environment variable VOLDEMORT_HOME or -# via a command line option. -# default: none -# voldemort.home= - -# The directory where voldemort data is stored -# default: ${voldemort.home}/data -# data.directory= - - -# The directory where voldemort configuration is stored -# default: ${voldemort.home}/config -# metadata.directory= - -# Should the BDB engine be enabled? -# default: true -# enable.bdb.engine= - - -# The BDB cache that is shared by all BDB tables. Bigger is better. -# default: 200MB (make it bigger!!!) -bdb.cache.size=50000000 - - -# Should transactions be immediately written to disk? -# default: false -# bdb.write.transactions= - -# When the transaction has been written to disk should we force the disk to flush the OS cache. This is a fairly expensive operation. -# default: false -# bdb.flush.transactions= - - -# The directory where the BDB environment is located -# default: ${data.directory}/bdb -# bdb.data.directory= - - -# The size of an individual log file -# default: 1GB -# bdb.max.logfile.size= - - -# The fanout size for the btree. Bigger fanout more effienciently supports larger btrees. -# default: 512 -# bdb.btree.fanout= - - -# How often (in bytes) should we checkpoint the transaction log? Checkpoints make startup and shutdown faster. -# default: 20 * 1024 * 1024 -# bdb.checkpoint.interval.bytes= - - -# How often in ms should we checkpoint the transaction log -# default: 30000 -# bdb.checkpoint.interval.ms= - - -# Should we enabled the mysql storage engine? Doing so will create a connection pool that will be used for the mysql instance -# default: false -# enable.mysql.engine= - - -# The mysql username to user -# default: root -# mysql.user= - - -# The mysql password to user -# mysql.password= - - -# The host of the mysql instance -# default: localhost -# mysql.host= - - -# The port of the mysql instance -# default: 3306 -# mysql.port= - - -# The name of the mysql database -# default: voldemort -# mysql.database= - - -#Should we enable the memory storage engine? Might as well this takes no resources and is just here for consistency. -# default: true -# enable.memory.engine= - - -# Should we enable the cache storage engine? Might as well this takes no resources and is just here for consistency. -# default: true -# enable.cache.engine= - - -# Should we enable the readonly storage engine? -# default: false -# enable.readonly.engine= - - -# The maximum time to wait to acquire a filehandle to perform reads. -# default: 4000 -# readonly.file.wait.timeout.ms= - - -# The number of backup copies of the data to keep around for rollback. -# default: 1 -# readonly.backups= - - -# The number of file descriptors to pool per store. -# default: 5 -# readonly.file.handles= - - -# The directory in which to store readonly data files. -# default: ${data.directory}/read-only -# readonly.data.directory= - - -# What storage engine should we use for storing misdelivered messages that need to be rerouted? -# default: bdb -# slop.store.engine= - - -# The maximum number of threads the server can use. -# default: 100 -# max.threads= - - -# The number of threads to keep alive even when idle. -# default: max(1, ${max.threads} / 2) -# core.threads= - - -# The socket SO_TIMEOUT. Essentially the amount of time to block on a low-level network operation before throwing an error. -# default: 4000 -# socket.timeout.ms= - - -# The total amount of time to wait for adequate responses from all nodes before throwing an error. -# default: 5000 -# routing.timeout.ms= - - -# Enable the HTTP data server? -# default: true -# http.enable= - - -# Enable the socket data server? -# default: true -# socket.enable= - - -# Enable JMX monitoring? -# default: true -# jmx.enable= - - -# Enable detection of misdelivered messages for persistence and redelivery. -# default: false -# slop.detection.enable= - - -# Log every operation on all stores. -# default: true -# enable.verbose.logging= - - -# Track load statistics on the stores. -# default: true -# enable.stat.tracking= - - -# How often should misdelivered "slop" data be pushed out to nodes? -# default: 2 * 60 * 1000 -# pusher.poll.ms= - - -# The number of threads to use for scheduling periodic jobs -# default: 3 -# scheduler.threads= http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/stores.xml ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/stores.xml b/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/stores.xml deleted file mode 100644 index a401733..0000000 --- a/extensions/entitystore-voldemort/src/test/resources/org/qi4j/entitystore/voldemort/stores.xml +++ /dev/null @@ -1,37 +0,0 @@ -<!-- - ~ Copyright (c) 2010 Niclas Hedhman <[email protected]>. - ~ - ~ Licensed 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. - --> - -<stores> - <store> - <name>qi4j-entities</name> - <replication-factor>1</replication-factor> - <preferred-reads>1</preferred-reads> - <required-reads>1</required-reads> - <preferred-writes>1</preferred-writes> - <required-writes>1</required-writes> - <persistence>bdb</persistence> - <routing>client</routing> - <key-serializer> - <type>string</type> - <schema-info>utf8</schema-info> - </key-serializer> - <value-serializer> - <type>identity</type> - </value-serializer> - </store> -</stores> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/osgi/bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/osgi/bootstrap/pom.xml b/extensions/osgi/bootstrap/pom.xml index af7e6c3..f0430f3 100644 --- a/extensions/osgi/bootstrap/pom.xml +++ b/extensions/osgi/bootstrap/pom.xml @@ -2,17 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-extensions</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.osgi</groupId> + <artifactId>org.qi4j.core.osgi-test</artifactId> + <version>0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.qi4j.osgi</groupId> <artifactId>qi4j-osgi-bootstrap</artifactId> - <version>1.3-SNAPSHOT</version> <name>Qi4j Core - OSGi Bootstrap</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> @@ -23,19 +22,19 @@ </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-spi</artifactId> + <artifactId>org.qi4j.core.spi</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/osgi/example/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/osgi/example/pom.xml b/extensions/osgi/example/pom.xml index db57b9f..27aaf41 100644 --- a/extensions/osgi/example/pom.xml +++ b/extensions/osgi/example/pom.xml @@ -2,17 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> - <groupId>org.qi4j.core.osgi</groupId> - <artifactId>qi4j-core-osgi-test</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.osgi</groupId> + <artifactId>org.qi4j.core.osgi-test</artifactId> + <version>0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.qi4j.core.osgi</groupId> <artifactId>qi4j-osgi-example</artifactId> - <version>1.3-SNAPSHOT</version> <name>Qi4j Core - OSGi Example</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> @@ -23,19 +22,19 @@ </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-spi</artifactId> + <artifactId>org.qi4j.core.spi</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/osgi/integrationTests/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/osgi/integrationTests/pom.xml b/extensions/osgi/integrationTests/pom.xml index fbdd2b5..c7b0d5c 100644 --- a/extensions/osgi/integrationTests/pom.xml +++ b/extensions/osgi/integrationTests/pom.xml @@ -2,15 +2,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> - <groupId>org.qi4j.core.osgi</groupId> - <artifactId>qi4j-core-osgi-test</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.osgi</groupId> + <artifactId>org.qi4j.core.osgi-test</artifactId> + <version>0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.qi4j.core.osgi</groupId> <artifactId>qi4j-osgi-integrationTests</artifactId> - <version>1.3-SNAPSHOT</version> <name>Qi4j Core - OSGi integration test</name> <build> @@ -32,11 +31,12 @@ <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core.osgi</groupId> <artifactId>qi4j-osgi-example</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/osgi/integrationTests/src/test/java/org/qi4j/osgi/test/AbstractTest.java ---------------------------------------------------------------------- diff --git a/extensions/osgi/integrationTests/src/test/java/org/qi4j/osgi/test/AbstractTest.java b/extensions/osgi/integrationTests/src/test/java/org/qi4j/osgi/test/AbstractTest.java index 6175fa2..c88830c 100644 --- a/extensions/osgi/integrationTests/src/test/java/org/qi4j/osgi/test/AbstractTest.java +++ b/extensions/osgi/integrationTests/src/test/java/org/qi4j/osgi/test/AbstractTest.java @@ -51,7 +51,7 @@ public abstract class AbstractTest @Configuration public final Option[] baseProvision() { - String qi4jVersion = System.getProperty( "version.qi4j", "1.0-SNAPSHOT" ); + String qi4jVersion = System.getProperty( "version.qi4j", "1.0" ); return options( provision( "mvn:org.ops4j.pax.logging/pax-logging-api@2", http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/osgi/pom.xml b/extensions/osgi/pom.xml index 06664a6..27d9e83 100644 --- a/extensions/osgi/pom.xml +++ b/extensions/osgi/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-extensions</artifactId> - <version>1.3-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-extensions</artifactId> + <version>0-SNAPSHOT</version> + </parent> <groupId>org.qi4j.osgi</groupId> - <artifactId>qi4j-core-osgi-test</artifactId> + <artifactId>org.qi4j.core.osgi-test</artifactId> <name>Qi4j OSGi (Build POM)</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/osgi/testBootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/osgi/testBootstrap/pom.xml b/extensions/osgi/testBootstrap/pom.xml index c6415fe..8624870 100644 --- a/extensions/osgi/testBootstrap/pom.xml +++ b/extensions/osgi/testBootstrap/pom.xml @@ -3,14 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j.core.osgi</groupId> - <artifactId>qi4j-core-osgi-test</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.osgi</groupId> + <artifactId>org.qi4j.core.osgi-test</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.core.osgi</groupId> - <artifactId>qi4j-core-osgi-test-bootstrap</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.core.osgi-test-bootstrap</artifactId> <name>Qi4j Core - OSGi Bootstrap tests</name> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/extensions/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/pom.xml b/extensions/pom.xml index c808f39..1abe46f 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -3,23 +3,35 @@ <parent> <groupId>org.qi4j.sandbox</groupId> <artifactId>qi4j-sandbox</artifactId> - <version>1.3-SNAPSHOT</version> + <version>0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>sb-extensions-root</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>qi4j-sandbox-extensions</artifactId> <name>Qi4j Sandbox Extensions - Build POM</name> <packaging>pom</packaging> <modules> - <!--module>entitystore-coherence</module--> <module>entitystore-jndi</module> - <module>entitystore-javaspaces</module> + <module>entitystore-cassandra</module> <module>entitystore-jgroups</module> <module>entitystore-rmi</module> <module>entitystore-s3</module> <module>entitystore-swift</module> - <module>entitystore-cassandra</module> + + <!-- Used coherence version not in any public repository. + Unable to make it compile against coherence-incubator. + <module>entitystore-coherence</module> --> + + <!-- See libraries/jini in sandbox + <module>entitystore-javaspaces</module> --> + + <!-- Unable to make it compile. + Plus `library/osgi` is already part of the SDK since 2.0. + <module>osgi</module> --> + + <!-- There are two implementations. + See the `gigaspaces_impl` branch of this repository + <module>entitstore-gigaspaces/qi4j-entitystore-gs-sample</module> --> </modules> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/beans/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/beans/pom.xml b/libraries/beans/pom.xml index ff44abd..defdb50 100644 --- a/libraries/beans/pom.xml +++ b/libraries/beans/pom.xml @@ -2,30 +2,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-beans</artifactId> + <artifactId>org.qi4j.library.beans</artifactId> <name>Qi4j Library - Beans</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/entityproxy/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/entityproxy/pom.xml b/libraries/entityproxy/pom.xml index 7dcfb78..012d95c 100644 --- a/libraries/entityproxy/pom.xml +++ b/libraries/entityproxy/pom.xml @@ -1,40 +1,40 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>sb-libraries-root</artifactId> <groupId>org.qi4j.sandbox</groupId> - <version>1.3-SNAPSHOT</version> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.sandbox</groupId> - <artifactId>qi4j-lib-entityproxy</artifactId> + <artifactId>org.qi4j.library.entityproxy</artifactId> <name>Qi4j Library - Entityproxy</name> <description>This library provides easy way to wrap your entities with transient composites so that qi4j-agnostic code may handle them without worrying about unit of work.</description> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> <version>${version.qi4j-core}</version> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-constraints</artifactId> + <artifactId>org.qi4j.library.constraints</artifactId> <version>${version.qi4j-core}</version> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <version>${version.qi4j-core}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <version>${version.qi4j-core}</version> <scope>test</scope> </dependency> </dependencies> <properties> - <version.qi4j-core>1.3-SNAPSHOT</version.qi4j-core> + <version.qi4j-core>1.3</version.qi4j-core> </properties> <build> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/exception/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/exception/pom.xml b/libraries/exception/pom.xml index 53ee5ee..14c30db 100644 --- a/libraries/exception/pom.xml +++ b/libraries/exception/pom.xml @@ -2,30 +2,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-exception</artifactId> + <artifactId>org.qi4j.library.exception</artifactId> <name>Qi4j Library - Exception Handling</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-spi</artifactId> + <artifactId>org.qi4j.core.spi</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/executor/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/executor/pom.xml b/libraries/executor/pom.xml index e1a01ee..d720245 100644 --- a/libraries/executor/pom.xml +++ b/libraries/executor/pom.xml @@ -2,32 +2,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-executor</artifactId> + <artifactId>org.qi4j.library.executor</artifactId> <name>Qi4j Library - Executor</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/common/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/jini/common/pom.xml b/libraries/jini/common/pom.xml index 6a2ef17..24e23a3 100644 --- a/libraries/jini/common/pom.xml +++ b/libraries/jini/common/pom.xml @@ -1,7 +1,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.qi4j.library.jini</groupId> + <artifactId>org.qi4j.library.jini</artifactId> + <version>0-SNAPSHOT</version> + </parent> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-common</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.jini-common</artifactId> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/importer/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/jini/importer/pom.xml b/libraries/jini/importer/pom.xml index e5a562b..4bc0aac 100644 --- a/libraries/jini/importer/pom.xml +++ b/libraries/jini/importer/pom.xml @@ -2,37 +2,37 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.library.jini</groupId> + <artifactId>org.qi4j.library.jini</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-importer</artifactId> + <artifactId>org.qi4j.library.jini-importer</artifactId> <name>Qi4j Library - Jini Services Importer</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-observations</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.observations</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.river</groupId> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/importer/src/test/java/org/qi4j/library/jini/importer/ImportExternalJiniServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/jini/importer/src/test/java/org/qi4j/library/jini/importer/ImportExternalJiniServiceTest.java b/libraries/jini/importer/src/test/java/org/qi4j/library/jini/importer/ImportExternalJiniServiceTest.java index 902457c..37267e4 100644 --- a/libraries/jini/importer/src/test/java/org/qi4j/library/jini/importer/ImportExternalJiniServiceTest.java +++ b/libraries/jini/importer/src/test/java/org/qi4j/library/jini/importer/ImportExternalJiniServiceTest.java @@ -50,7 +50,7 @@ public class ImportExternalJiniServiceTest { public void assemble( ModuleAssembly module ) throws AssemblyException { - module.importServices( InterpreterService.class ).importedBy( JiniImporter.class ); + module.importedServices( InterpreterService.class ).importedBy( JiniImporter.class ); } }; final ServiceFinder finder = assembler.serviceFinder(); http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/javaspaces/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/jini/javaspaces/pom.xml b/libraries/jini/javaspaces/pom.xml index f207a69..d84809c 100644 --- a/libraries/jini/javaspaces/pom.xml +++ b/libraries/jini/javaspaces/pom.xml @@ -2,52 +2,52 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.library.jini</groupId> + <artifactId>org.qi4j.library.jini</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-javaspaces</artifactId> + <artifactId>org.qi4j.library.jini-javaspaces</artifactId> <name>Qi4j Library - Jini Javaspaces Services</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-http</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.http</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-logging</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.logging</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-lookup</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.jini-lookup</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-transaction</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.jini-transaction</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/lookup/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/jini/lookup/pom.xml b/libraries/jini/lookup/pom.xml index c5e520b..86a6b70 100644 --- a/libraries/jini/lookup/pom.xml +++ b/libraries/jini/lookup/pom.xml @@ -2,42 +2,42 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.library.jini</groupId> + <artifactId>org.qi4j.library.jini</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-lookup</artifactId> + <artifactId>org.qi4j.library.jini-lookup</artifactId> <name>Qi4j Library - Jini Lookup Service</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-http</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.http</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-logging</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.logging</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.apache.river</groupId> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/jini/pom.xml b/libraries/jini/pom.xml index f6933a8..b7a59ff 100644 --- a/libraries/jini/pom.xml +++ b/libraries/jini/pom.xml @@ -1,10 +1,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> + </parent> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini</artifactId> + <artifactId>org.qi4j.library.jini</artifactId> <name>Qi4j Library - Jini</name> - <version>1.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/jini/transaction/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/jini/transaction/pom.xml b/libraries/jini/transaction/pom.xml index 0f47267..1c8d0eb 100644 --- a/libraries/jini/transaction/pom.xml +++ b/libraries/jini/transaction/pom.xml @@ -2,42 +2,42 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.library.jini</groupId> + <artifactId>org.qi4j.library.jini</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-transaction</artifactId> + <artifactId>org.qi4j.library.jini-transaction</artifactId> <name>Qi4j Library - Jini Transaction Service</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-http</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.http</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-logging</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.logging</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.qi4j.library.jini</groupId> - <artifactId>qi4j-lib-jini-lookup</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.jini-lookup</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.river</groupId> @@ -66,7 +66,7 @@ </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/ldap/client/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldap/client/pom.xml b/libraries/ldap/client/pom.xml index a5a517f..da660d6 100644 --- a/libraries/ldap/client/pom.xml +++ b/libraries/ldap/client/pom.xml @@ -2,18 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.library</groupId> + <artifactId>org.qi4j.library.ldap</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-ldap-client</artifactId> + <artifactId>org.qi4j.library.ldap-client</artifactId> <name>Qi4j Library - LDAP Client</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/ldap/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldap/pom.xml b/libraries/ldap/pom.xml index 5c65581..c309da0 100644 --- a/libraries/ldap/pom.xml +++ b/libraries/ldap/pom.xml @@ -1,10 +1,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> + </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-ldap</artifactId> - <name>Qi4j Library LDAP</name> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.ldap</artifactId> + <name>Qi4j Library - LDAP - Build POM</name> <packaging>pom</packaging> <!-- This POM is ONLY to initiate the modules to be built. --> <modules> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/ldap/server/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldap/server/pom.xml b/libraries/ldap/server/pom.xml index 5eb7648..43313d1 100644 --- a/libraries/ldap/server/pom.xml +++ b/libraries/ldap/server/pom.xml @@ -2,18 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.library</groupId> + <artifactId>org.qi4j.library.ldap</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-ldap-server</artifactId> + <artifactId>org.qi4j.library.ldap-server</artifactId> <name>Qi4j Library - LDAP Server</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.apache.directory.server</groupId> @@ -22,12 +22,12 @@ </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/observations/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/observations/pom.xml b/libraries/observations/pom.xml index beb4eb7..db4f755 100644 --- a/libraries/observations/pom.xml +++ b/libraries/observations/pom.xml @@ -2,23 +2,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-observations</artifactId> + <artifactId>org.qi4j.library.observations</artifactId> <name>Qi4j Library - Event/Observation Handling</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-exception</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.exception</artifactId> + <version>${project.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/pom.xml b/libraries/pom.xml index 8e50e46..9aeae7d 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -4,9 +4,9 @@ <parent> <groupId>org.qi4j.sandbox</groupId> <artifactId>qi4j-sandbox</artifactId> - <version>1.3-SNAPSHOT</version> + <version>0-SNAPSHOT</version> </parent> - <artifactId>sb-libraries-root</artifactId> + <artifactId>qi4j-sandbox-libraries</artifactId> <name>Qi4j Sandbox Libraries - Build POM</name> <packaging>pom</packaging> @@ -15,7 +15,6 @@ <module>entityproxy</module> <module>exception</module> <module>executor</module> - <module>jini</module> <module>ldap</module> <module>observations</module> <module>registry</module> @@ -23,5 +22,11 @@ <module>thread</module> <module>unitofwork</module> <module>validation</module> + + <!-- Depends on incubator release of Apache River. + Could not find a repository with the correct JARs. + Unable to make it compile against Apache River TLP artifacts. + <module>jini</module> --> + </modules> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/registry/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/registry/pom.xml b/libraries/registry/pom.xml index 9ac6410..6a8493d 100644 --- a/libraries/registry/pom.xml +++ b/libraries/registry/pom.xml @@ -2,23 +2,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-registry</artifactId> + <artifactId>org.qi4j.library.registry</artifactId> <name>Qi4j Library - Registry</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-exception</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.exception</artifactId> + <version>${project.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/rmi/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/rmi/pom.xml b/libraries/rmi/pom.xml index b524cc5..e3caafe 100644 --- a/libraries/rmi/pom.xml +++ b/libraries/rmi/pom.xml @@ -2,37 +2,37 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-rmi</artifactId> + <artifactId>org.qi4j.library.rmi</artifactId> <name>Qi4j Library - RMI</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-cache</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.cache</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/thread/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/thread/pom.xml b/libraries/thread/pom.xml index d5159fe..e166576 100644 --- a/libraries/thread/pom.xml +++ b/libraries/thread/pom.xml @@ -2,42 +2,42 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-thread</artifactId> + <artifactId>org.qi4j.library.thread</artifactId> <name>Qi4j Library - Thread</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-bootstrap</artifactId> + <artifactId>org.qi4j.core.bootstrap</artifactId> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-testsupport</artifactId> + <artifactId>org.qi4j.core.testsupport</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-runtime</artifactId> + <artifactId>org.qi4j.core.runtime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-constraints</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.constraints</artifactId> + <version>${version.qi4j}</version> </dependency> <dependency> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-uid</artifactId> - <version>1.3-SNAPSHOT</version> + <artifactId>org.qi4j.library.uid</artifactId> + <version>${version.qi4j}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/unitofwork/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/unitofwork/pom.xml b/libraries/unitofwork/pom.xml index 1e38947..9749a0b 100644 --- a/libraries/unitofwork/pom.xml +++ b/libraries/unitofwork/pom.xml @@ -2,18 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-unitofwork</artifactId> + <artifactId>org.qi4j.library.unitofwork</artifactId> <name>Qi4j Library - UnitOfWork</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/libraries/validation/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/validation/pom.xml b/libraries/validation/pom.xml index d99fdac..0b0b3da 100644 --- a/libraries/validation/pom.xml +++ b/libraries/validation/pom.xml @@ -2,18 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.qi4j</groupId> - <artifactId>qi4j-library</artifactId> - <version>1.3-SNAPSHOT</version> + <groupId>org.qi4j.sandbox</groupId> + <artifactId>qi4j-sandbox-libraries</artifactId> + <version>0-SNAPSHOT</version> </parent> <groupId>org.qi4j.library</groupId> - <artifactId>qi4j-lib-validation</artifactId> + <artifactId>org.qi4j.library.validation</artifactId> <name>Qi4j Library - Validation</name> <dependencies> <dependency> <groupId>org.qi4j.core</groupId> - <artifactId>qi4j-core-api</artifactId> + <artifactId>org.qi4j.core.api</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/23b1f5d9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 304333a..b7be1bd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,84 @@ <groupId>org.qi4j.sandbox</groupId> <artifactId>qi4j-sandbox</artifactId> <packaging>pom</packaging> - <version>1.3-SNAPSHOT</version> + <version>0-SNAPSHOT</version> <name>Qi4j Sandbox - Build POM</name> + <modules> <module>libraries</module> <module>extensions</module> </modules> + <repositories> + <repository> + <id>qi4j-releases</id> + <url>https://repository-qi4j.forge.cloudbees.com/release/</url> + </repository> + <repository> + <id>qi4j-snapshots</id> + <url>https://repository-qi4j.forge.cloudbees.com/snapshot/</url> + <releases><enabled>false</enabled></releases> + <snapshots><enabled>true</enabled></snapshots> + </repository> + </repositories> + + <properties> + <version.qi4j>1.3</version.qi4j> + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.api</artifactId> + <version>${version.qi4j}</version> + </dependency> + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.spi</artifactId> + <version>${version.qi4j}</version> + </dependency> + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.bootstrap</artifactId> + <version>${version.qi4j}</version> + </dependency> + + <dependency> + <groupId>org.qi4j.library</groupId> + <artifactId>org.qi4j.library.locking</artifactId> + <version>${version.qi4j}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> + </dependency> + + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.runtime</artifactId> + <scope>runtime</scope> + <version>${version.qi4j}</version> + </dependency> + + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.testsupport</artifactId> + <version>${version.qi4j}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + + </dependencies> + </dependencyManagement> + </project>
