You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by si...@apache.org on 2013/02/23 17:16:41 UTC
svn commit: r1449350 - in /incubator/onami/trunk/spi: ./ all/ all/src/
all/src/main/ all/src/main/java/ all/src/test/ all/src/test/java/ core/
core/src/ core/src/main/ core/src/main/java/ core/src/main/java/org/
core/src/main/java/org/apache/ core/src/...
Author: simonetripodi
Date: Sat Feb 23 16:16:39 2013
New Revision: 1449350
URL: http://svn.apache.org/r1449350
Log:
[ONAMI-86] #comment SPI modules splitted in submodules #resolve
Added:
incubator/onami/trunk/spi/all/ (with props)
incubator/onami/trunk/spi/all/pom.xml (with props)
incubator/onami/trunk/spi/all/src/
incubator/onami/trunk/spi/all/src/main/
incubator/onami/trunk/spi/all/src/main/java/
incubator/onami/trunk/spi/all/src/test/
incubator/onami/trunk/spi/all/src/test/java/
incubator/onami/trunk/spi/core/ (with props)
incubator/onami/trunk/spi/core/pom.xml (with props)
incubator/onami/trunk/spi/core/src/
incubator/onami/trunk/spi/core/src/main/
incubator/onami/trunk/spi/core/src/main/java/
incubator/onami/trunk/spi/core/src/main/java/org/
incubator/onami/trunk/spi/core/src/main/java/org/apache/
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/AbstractServiceClassIterator.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/AbstractServiceClassIterator.java
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/PropertyServiceClassIterator.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/PropertyServiceClassIterator.java
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/ServiceLoader.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoader.java
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/URLServiceNamesIterator.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/URLServiceNamesIterator.java
incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/package-info.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/package-info.java
incubator/onami/trunk/spi/core/src/test/
incubator/onami/trunk/spi/core/src/test/java/
incubator/onami/trunk/spi/core/src/test/java/org/
incubator/onami/trunk/spi/core/src/test/java/org/apache/
incubator/onami/trunk/spi/core/src/test/java/org/apache/onami/
incubator/onami/trunk/spi/core/src/test/java/org/apache/onami/spi/
incubator/onami/trunk/spi/core/src/test/java/org/apache/onami/spi/core/
incubator/onami/trunk/spi/deploySite.sh (with props)
incubator/onami/trunk/spi/modules/ (with props)
incubator/onami/trunk/spi/modules/pom.xml (with props)
incubator/onami/trunk/spi/modules/src/
incubator/onami/trunk/spi/modules/src/main/
incubator/onami/trunk/spi/modules/src/main/java/
incubator/onami/trunk/spi/modules/src/main/java/org/
incubator/onami/trunk/spi/modules/src/main/java/org/apache/
incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/
incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/
incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/
incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/GuiceServiceLoader.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/GuiceServiceLoader.java
incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java (with props)
incubator/onami/trunk/spi/modules/src/test/
incubator/onami/trunk/spi/modules/src/test/java/
incubator/onami/trunk/spi/modules/src/test/java/org/
incubator/onami/trunk/spi/modules/src/test/java/org/apache/
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java (with props)
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java (with props)
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java (with props)
incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/GuiceServiceLoaderTestCase.java
incubator/onami/trunk/spi/modules/src/test/resources/
incubator/onami/trunk/spi/modules/src/test/resources/META-INF/
incubator/onami/trunk/spi/modules/src/test/resources/META-INF/services/
incubator/onami/trunk/spi/modules/src/test/resources/META-INF/services/com.google.inject.Module
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/resources/META-INF/services/com.google.inject.Module
incubator/onami/trunk/spi/services/ (with props)
incubator/onami/trunk/spi/services/pom.xml (with props)
incubator/onami/trunk/spi/services/src/
incubator/onami/trunk/spi/services/src/main/
incubator/onami/trunk/spi/services/src/main/java/
incubator/onami/trunk/spi/services/src/main/java/org/
incubator/onami/trunk/spi/services/src/main/java/org/apache/
incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/
incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/
incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/
incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/FromClassLoaderBuilder.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/binder/FromClassLoaderBuilder.java
incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoaderModule.java
incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java (with props)
incubator/onami/trunk/spi/services/src/test/
incubator/onami/trunk/spi/services/src/test/java/
incubator/onami/trunk/spi/services/src/test/java/org/
incubator/onami/trunk/spi/services/src/test/java/org/apache/
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeService.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeService.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl1.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl1.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl2.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl2.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/BarBindingAnnotation.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooService.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooService.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl1.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl1.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl2.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl2.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FromSystemPropertiesTestCase.java
incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/ServiceLoaderModuleTestCase.java
incubator/onami/trunk/spi/services/src/test/resources/
incubator/onami/trunk/spi/services/src/test/resources/META-INF/
incubator/onami/trunk/spi/services/src/test/resources/META-INF/services/
incubator/onami/trunk/spi/services/src/test/resources/META-INF/services/org.apache.onami.spi.services.AcmeService
- copied, changed from r1449198, incubator/onami/trunk/spi/src/test/resources/META-INF/services/org.apache.onami.spi.AcmeService
incubator/onami/trunk/spi/src/site/apt/all.apt.vm (with props)
incubator/onami/trunk/spi/src/site/apt/modules.apt.vm
- copied, changed from r1449198, incubator/onami/trunk/spi/src/site/apt/modules.apt
incubator/onami/trunk/spi/src/site/apt/services.apt.vm
- copied, changed from r1449198, incubator/onami/trunk/spi/src/site/apt/services.apt
Removed:
incubator/onami/trunk/spi/src/main/
incubator/onami/trunk/spi/src/site/apt/modules.apt
incubator/onami/trunk/spi/src/site/apt/services.apt
incubator/onami/trunk/spi/src/test/
Modified:
incubator/onami/trunk/spi/pom.xml
incubator/onami/trunk/spi/src/site/apt/index.apt.vm
incubator/onami/trunk/spi/src/site/site.xml
Propchange: incubator/onami/trunk/spi/all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 23 16:16:39 2013
@@ -0,0 +1 @@
+target
Added: incubator/onami/trunk/spi/all/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/all/pom.xml?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/all/pom.xml (added)
+++ incubator/onami/trunk/spi/all/pom.xml Sat Feb 23 16:16:39 2013
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ | 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.
+-->
+<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.apache.onami.spi</groupId>
+ <artifactId>org.apache.onami.spi.parent</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.onami.spi.all</artifactId>
+
+ <name>Apache Onami-SPI - All</name>
+ <description>Apache Onami-SPI all modules in one single package</description>
+
+ <properties>
+ <site.skip>true</site.skip>
+ <osgi.export>!org.apache.onami.spi.core,org.apache.onami.spi.*;version=${project.version}</osgi.export>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.apache.onami.spi.modules</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.apache.onami.spi.services</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <!-- in order to create the 'all' package, 'release' profile must be active -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>src-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+ <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <excludes>META-INF/*</excludes>
+ <outputDirectory>${project.build.directory}/sources</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/onami/trunk/spi/all/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/all/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/onami/trunk/spi/all/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: incubator/onami/trunk/spi/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 23 16:16:39 2013
@@ -0,0 +1,2 @@
+.settings
+target
Added: incubator/onami/trunk/spi/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/core/pom.xml?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/core/pom.xml (added)
+++ incubator/onami/trunk/spi/core/pom.xml Sat Feb 23 16:16:39 2013
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ | 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.
+-->
+<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.apache.onami.spi</groupId>
+ <artifactId>org.apache.onami.spi.parent</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.onami.spi.core</artifactId>
+
+ <name>Apache Onami-SPI - Core</name>
+ <description>Apache Onami-SPI Core module</description>
+
+ <properties>
+ <site.skip>true</site.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Propchange: incubator/onami/trunk/spi/core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/core/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/onami/trunk/spi/core/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/AbstractServiceClassIterator.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/AbstractServiceClassIterator.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/AbstractServiceClassIterator.java?p2=incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/AbstractServiceClassIterator.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/AbstractServiceClassIterator.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/AbstractServiceClassIterator.java (original)
+++ incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/AbstractServiceClassIterator.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.core;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/PropertyServiceClassIterator.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/PropertyServiceClassIterator.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/PropertyServiceClassIterator.java?p2=incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/PropertyServiceClassIterator.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/PropertyServiceClassIterator.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/PropertyServiceClassIterator.java (original)
+++ incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/PropertyServiceClassIterator.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.core;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/ServiceLoader.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoader.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/ServiceLoader.java?p2=incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/ServiceLoader.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoader.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoader.java (original)
+++ incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/ServiceLoader.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.core;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -36,7 +36,7 @@ import com.google.inject.ProvisionExcept
*
* @param <S> The type of the service to be loaded by this loader.
*/
-final class ServiceLoader<S>
+public final class ServiceLoader<S>
implements Iterable<Class<? extends S>>
{
Copied: incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/URLServiceNamesIterator.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/URLServiceNamesIterator.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/URLServiceNamesIterator.java?p2=incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/URLServiceNamesIterator.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/URLServiceNamesIterator.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/URLServiceNamesIterator.java (original)
+++ incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/URLServiceNamesIterator.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.core;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/package-info.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/package-info.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/package-info.java?p2=incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/package-info.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/package-info.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/package-info.java (original)
+++ incubator/onami/trunk/spi/core/src/main/java/org/apache/onami/spi/core/package-info.java Sat Feb 23 16:16:39 2013
@@ -19,6 +19,6 @@
*/
/**
- * SPI APIs integrated into Google Guice via fluent APIs.
+ * Lightweight Java5 compatible ServiceLoader implementation.
*/
-package org.apache.onami.spi;
+package org.apache.onami.spi.core;
Added: incubator/onami/trunk/spi/deploySite.sh
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/deploySite.sh?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/deploySite.sh (added)
+++ incubator/onami/trunk/spi/deploySite.sh Sat Feb 23 16:16:39 2013
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#
+# 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.
+#
+
+mvn clean site-deploy scm-publish:publish-scm $@
Propchange: incubator/onami/trunk/spi/deploySite.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/deploySite.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/onami/trunk/spi/deploySite.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/onami/trunk/spi/deploySite.sh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: incubator/onami/trunk/spi/modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 23 16:16:39 2013
@@ -0,0 +1,2 @@
+.settings
+target
Added: incubator/onami/trunk/spi/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/pom.xml?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/modules/pom.xml (added)
+++ incubator/onami/trunk/spi/modules/pom.xml Sat Feb 23 16:16:39 2013
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ | 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.
+-->
+<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.apache.onami.spi</groupId>
+ <artifactId>org.apache.onami.spi.parent</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.onami.spi.modules</artifactId>
+
+ <name>Apache Onami-SPI - Modules</name>
+ <description>Apache Onami-SPI Guice Modules module</description>
+
+ <properties>
+ <site.skip>true</site.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.apache.onami.spi.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Propchange: incubator/onami/trunk/spi/modules/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/modules/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/onami/trunk/spi/modules/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/GuiceServiceLoader.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/GuiceServiceLoader.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/GuiceServiceLoader.java?p2=incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/GuiceServiceLoader.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/GuiceServiceLoader.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/GuiceServiceLoader.java (original)
+++ incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/GuiceServiceLoader.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.modules;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.onami.spi;
import static java.lang.String.format;
import static java.lang.Thread.currentThread;
-import static org.apache.onami.spi.ServiceLoader.load;
-import static org.apache.onami.spi.ServiceLoader.loadInstalled;
+import static org.apache.onami.spi.core.ServiceLoader.load;
+import static org.apache.onami.spi.core.ServiceLoader.loadInstalled;
import java.util.Iterator;
Added: incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java (added)
+++ incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java Sat Feb 23 16:16:39 2013
@@ -0,0 +1,24 @@
+
+/*
+ * 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.
+ */
+
+/**
+ * Guice Module discovery and load via SPI pattern.
+ */
+package org.apache.onami.spi.modules;
Propchange: incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/onami/trunk/spi/modules/src/main/java/org/apache/onami/spi/modules/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java (added)
+++ incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java Sat Feb 23 16:16:39 2013
@@ -0,0 +1,27 @@
+package org.apache.onami.spi.modules;
+
+/*
+ * 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.
+ */
+
+public interface AcmeService
+{
+
+ void doSomething();
+
+}
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeService.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java (added)
+++ incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java Sat Feb 23 16:16:39 2013
@@ -0,0 +1,32 @@
+package org.apache.onami.spi.modules;
+
+/*
+ * 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.
+ */
+
+public final class AcmeServiceImpl1
+ implements AcmeService
+{
+
+ public void doSomething()
+ {
+ // but does nothing
+
+ }
+
+}
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl1.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java (added)
+++ incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java Sat Feb 23 16:16:39 2013
@@ -0,0 +1,34 @@
+package org.apache.onami.spi.modules;
+
+import javax.inject.Named;
+
+/*
+ * 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.
+ */
+
+@Named( "second" )
+public final class AcmeServiceImpl2
+ implements AcmeService
+{
+
+ public void doSomething()
+ {
+ // but does nothing
+ }
+
+}
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/AcmeServiceImpl2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/GuiceServiceLoaderTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java?p2=incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/GuiceServiceLoaderTestCase.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/GuiceServiceLoaderTestCase.java (original)
+++ incubator/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.modules;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.apache.onami.spi;
*/
import static com.google.inject.util.Modules.combine;
-import static org.apache.onami.spi.GuiceServiceLoader.loadModules;
+import static org.apache.onami.spi.modules.GuiceServiceLoader.loadModules;
import static org.junit.Assert.assertEquals;
import org.apache.onami.test.OnamiRunner;
Copied: incubator/onami/trunk/spi/modules/src/test/resources/META-INF/services/com.google.inject.Module (from r1449198, incubator/onami/trunk/spi/src/test/resources/META-INF/services/com.google.inject.Module)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/modules/src/test/resources/META-INF/services/com.google.inject.Module?p2=incubator/onami/trunk/spi/modules/src/test/resources/META-INF/services/com.google.inject.Module&p1=incubator/onami/trunk/spi/src/test/resources/META-INF/services/com.google.inject.Module&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/resources/META-INF/services/com.google.inject.Module (original)
+++ incubator/onami/trunk/spi/modules/src/test/resources/META-INF/services/com.google.inject.Module Sat Feb 23 16:16:39 2013
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.onami.spi.GuiceServiceLoaderTestCase$AcmeModule # EOL comment
+org.apache.onami.spi.modules.GuiceServiceLoaderTestCase$AcmeModule # EOL comment
# comments & blank lines
Modified: incubator/onami/trunk/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/pom.xml?rev=1449350&r1=1449349&r2=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/pom.xml (original)
+++ incubator/onami/trunk/spi/pom.xml Sat Feb 23 16:16:39 2013
@@ -26,8 +26,10 @@
<version>2-incubating</version>
</parent>
- <artifactId>org.apache.onami.spi</artifactId>
+ <groupId>org.apache.onami.spi</groupId>
+ <artifactId>org.apache.onami.spi.parent</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>Apache Onami-SPI</name>
<description>Apache Onami-SPI is a Java5 compatible small collection of reusable tools to make easier the integration
@@ -35,6 +37,12 @@
<url>http://onami.incubator.apache.org/spi/</url>
<inceptionYear>2012</inceptionYear>
+ <modules>
+ <module>core</module>
+ <module>modules</module>
+ <module>services</module>
+ </modules>
+
<scm>
<url>https://svn.apache.org/viewvc/incubator/onami/trunk/spi</url>
<connection>scm:svn:https://svn.apache.org/repos/asf/incubator/onami/trunk/spi</connection>
@@ -68,6 +76,12 @@
</site>
</distributionManagement>
+ <properties>
+ <onami.spi.siteFilePath>${user.home}/onami-sites/onami-spi-site/</onami.spi.siteFilePath>
+ <onami.spi.siteUrlDeployment>file://${onami.spi.siteFilePath}</onami.spi.siteUrlDeployment>
+ <onami.spi.scmPubCheckoutDirectory>${user.home}/onami-sites/onami-spi-site-content</onami.spi.scmPubCheckoutDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.google.inject</groupId>
@@ -89,53 +103,48 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <locales>en</locales>
- <skipDeploy>true</skipDeploy>
- </configuration>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- <execution>
- <id>stage-for-scm-publish</id>
- <phase>post-site</phase>
- <goals>
- <goal>stage</goal>
- </goals>
- <configuration>
- <skipDeploy>false</skipDeploy>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <checkoutDirectory>${onami.spi.scmPubCheckoutDirectory}</checkoutDirectory>
+ <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/incubator/onami/site/spi</pubScmUrl>
+ <checkinComment>Onami SPI site deployment</checkinComment>
+ <content>${onami.spi.siteFilePath}</content>
+ <tryUpdate>true</tryUpdate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <checkinComment>Onami SPI site deployment</checkinComment>
- <checkoutDirectory>${user.home}/onami-sites/onami-spi-site</checkoutDirectory>
- </configuration>
- <executions>
- <execution>
- <id>scm-publish</id>
- <phase>site-deploy</phase>
- <goals>
- <goal>publish-scm</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
- </build>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>all</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Propchange: incubator/onami/trunk/spi/services/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 23 16:16:39 2013
@@ -0,0 +1,2 @@
+.settings
+target
Added: incubator/onami/trunk/spi/services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/pom.xml?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/services/pom.xml (added)
+++ incubator/onami/trunk/spi/services/pom.xml Sat Feb 23 16:16:39 2013
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ | 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.
+-->
+<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.apache.onami.spi</groupId>
+ <artifactId>org.apache.onami.spi.parent</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.onami.spi.services</artifactId>
+
+ <name>Apache Onami-SPI - Services</name>
+ <description>Apache Onami-SPI Services module</description>
+
+ <properties>
+ <site.skip>true</site.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.apache.onami.spi.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Propchange: incubator/onami/trunk/spi/services/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/services/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/onami/trunk/spi/services/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/FromClassLoaderBuilder.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/binder/FromClassLoaderBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/FromClassLoaderBuilder.java?p2=incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/FromClassLoaderBuilder.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/binder/FromClassLoaderBuilder.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/binder/FromClassLoaderBuilder.java (original)
+++ incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/FromClassLoaderBuilder.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi.binder;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java (from r1449198, incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoaderModule.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java?p2=incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java&p1=incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoaderModule.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/main/java/org/apache/onami/spi/ServiceLoaderModule.java (original)
+++ incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.onami.spi;
import static java.lang.String.format;
import static java.lang.Thread.currentThread;
-import static org.apache.onami.spi.ServiceLoader.load;
+import static org.apache.onami.spi.core.ServiceLoader.load;
import java.lang.annotation.Annotation;
import java.util.Iterator;
@@ -30,8 +30,6 @@ import java.util.List;
import javax.inject.Qualifier;
-import org.apache.onami.spi.binder.FromClassLoaderBuilder;
-
import com.google.inject.AbstractModule;
import com.google.inject.BindingAnnotation;
import com.google.inject.ProvisionException;
Added: incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java (added)
+++ incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java Sat Feb 23 16:16:39 2013
@@ -0,0 +1,24 @@
+
+/*
+ * 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.
+ */
+
+/**
+ * Small EDSL to discover and bind services implementation via SPI pattern.
+ */
+package org.apache.onami.spi.services;
Propchange: incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeService.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeService.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeService.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeService.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeService.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeService.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeService.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl1.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl1.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl1.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl1.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl1.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl1.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl1.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl2.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl2.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl2.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl2.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl2.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/AcmeServiceImpl2.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/AcmeServiceImpl2.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
import javax.inject.Named;
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/BarBindingAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/BarBindingAnnotation.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/BarBindingAnnotation.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooService.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooService.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooService.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooService.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooService.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooService.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooService.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl1.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl1.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl1.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl1.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl1.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl1.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl1.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl2.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl2.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl2.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl2.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl2.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FooServiceImpl2.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FooServiceImpl2.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FromSystemPropertiesTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FromSystemPropertiesTestCase.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/FromSystemPropertiesTestCase.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,23 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
+
+/*
+ * 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.
+ */
import static org.junit.Assert.assertEquals;
@@ -18,10 +37,10 @@ public final class FromSystemPropertiesT
public static Module createTestModule()
{
// This simulates the SPI specification via Java System Properties,
- // equivalent to java -Dorg.apache.onami.spi.FooService=org.apac...
- System.setProperty( "org.apache.onami.spi.FooService",
- "org.apache.onami.spi.FooServiceImpl1," +
- "org.apache.onami.spi.FooServiceImpl2");
+ // equivalent to java -Dorg.apache.onami.spi.services.FooService=org.apac...
+ System.setProperty( "org.apache.onami.spi.services.FooService",
+ "org.apache.onami.spi.services.FooServiceImpl1," +
+ "org.apache.onami.spi.services.FooServiceImpl2");
return new ServiceLoaderModule()
{
Copied: incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java (from r1449198, incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/ServiceLoaderModuleTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java?p2=incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java&p1=incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/ServiceLoaderModuleTestCase.java&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/java/org/apache/onami/spi/ServiceLoaderModuleTestCase.java (original)
+++ incubator/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java Sat Feb 23 16:16:39 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.spi;
+package org.apache.onami.spi.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: incubator/onami/trunk/spi/services/src/test/resources/META-INF/services/org.apache.onami.spi.services.AcmeService (from r1449198, incubator/onami/trunk/spi/src/test/resources/META-INF/services/org.apache.onami.spi.AcmeService)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/services/src/test/resources/META-INF/services/org.apache.onami.spi.services.AcmeService?p2=incubator/onami/trunk/spi/services/src/test/resources/META-INF/services/org.apache.onami.spi.services.AcmeService&p1=incubator/onami/trunk/spi/src/test/resources/META-INF/services/org.apache.onami.spi.AcmeService&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/test/resources/META-INF/services/org.apache.onami.spi.AcmeService (original)
+++ incubator/onami/trunk/spi/services/src/test/resources/META-INF/services/org.apache.onami.spi.services.AcmeService Sat Feb 23 16:16:39 2013
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.onami.spi.AcmeServiceImpl1 # EOL comment
+org.apache.onami.spi.services.AcmeServiceImpl1 # EOL comment
# comments & blank lines
@@ -23,7 +23,7 @@ org.apache.onami.spi.AcmeServiceImpl1
#
-org.apache.onami.spi.AcmeServiceImpl2 # EOL comment
+org.apache.onami.spi.services.AcmeServiceImpl2 # EOL comment
# comments & blank lines
Added: incubator/onami/trunk/spi/src/site/apt/all.apt.vm
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/src/site/apt/all.apt.vm?rev=1449350&view=auto
==============================================================================
--- incubator/onami/trunk/spi/src/site/apt/all.apt.vm (added)
+++ incubator/onami/trunk/spi/src/site/apt/all.apt.vm Sat Feb 23 16:16:39 2013
@@ -0,0 +1,40 @@
+ ------
+ Apache Onami SPI | All
+ ------
+ The Apache Onami Team
+ ------
+ 2013
+
+~~
+~~ 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.
+~~
+
+Apache Onami SPI - All
+
+ The <<All>> module is a special module that contains all <<<${project.groupId}>>> converters implementations.
+
+ Users that want to use the <All> module, have to add the following dependency in the <<<pom.xml>>>:
+
++--------------------------------------+
+<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.groupId}.all</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+</dependency>
++--------------------------------------+
Propchange: incubator/onami/trunk/spi/src/site/apt/all.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/onami/trunk/spi/src/site/apt/all.apt.vm
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/onami/trunk/spi/src/site/apt/all.apt.vm
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/onami/trunk/spi/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/src/site/apt/index.apt.vm?rev=1449350&r1=1449349&r2=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/site/apt/index.apt.vm (original)
+++ incubator/onami/trunk/spi/src/site/apt/index.apt.vm Sat Feb 23 16:16:39 2013
@@ -32,19 +32,3 @@ Welcome to ${project.name}!
It tries to take the best from the past experiences in
{{{http://commons.apache.org/discovery}Apache Commons Discovery}} and
{{{http://99soft.github.com/backport-spi/}Backport SPI}}.
-
-Before starting
-
- ${project.name} is available on the Maven Central repo, you just need to add the dependency below in your <<<pom.xml>>> file:
-
-+--------------------------------------+
-<dependencies>
- ...
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- ...
-</dependencies>
-+--------------------------------------+
Copied: incubator/onami/trunk/spi/src/site/apt/modules.apt.vm (from r1449198, incubator/onami/trunk/spi/src/site/apt/modules.apt)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/src/site/apt/modules.apt.vm?p2=incubator/onami/trunk/spi/src/site/apt/modules.apt.vm&p1=incubator/onami/trunk/spi/src/site/apt/modules.apt&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/site/apt/modules.apt (original)
+++ incubator/onami/trunk/spi/src/site/apt/modules.apt.vm Sat Feb 23 16:16:39 2013
@@ -71,3 +71,16 @@ java -Dcom.google.inject.Module=com.acme
If SPIs will be found in <Java System properties>, <<<META-INF/services/com.google.inject.Module>>>
file(s) will be ignored
+
+Apache Maven Users
+
+ Just add the dependency below and let Maven do the rest:
+
++--------------------------------------+
+<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.groupId}.modules</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+</dependency>
++--------------------------------------+
Copied: incubator/onami/trunk/spi/src/site/apt/services.apt.vm (from r1449198, incubator/onami/trunk/spi/src/site/apt/services.apt)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/src/site/apt/services.apt.vm?p2=incubator/onami/trunk/spi/src/site/apt/services.apt.vm&p1=incubator/onami/trunk/spi/src/site/apt/services.apt&r1=1449198&r2=1449350&rev=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/site/apt/services.apt (original)
+++ incubator/onami/trunk/spi/src/site/apt/services.apt.vm Sat Feb 23 16:16:39 2013
@@ -273,3 +273,17 @@ java -Dcom.acme.CreditCardProcessor=com.
If SPIs will be found in <Java System properties>, <<<META-INF/services/com.acme.FooService>>>
file(s) will be ignored
+
+Apache Maven Users
+
+ Just add the dependency below and let Maven do the rest:
+
++--------------------------------------+
+<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.groupId}.services</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+</dependency>
++--------------------------------------+
+
\ No newline at end of file
Modified: incubator/onami/trunk/spi/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/src/site/site.xml?rev=1449350&r1=1449349&r2=1449350&view=diff
==============================================================================
--- incubator/onami/trunk/spi/src/site/site.xml (original)
+++ incubator/onami/trunk/spi/src/site/site.xml Sat Feb 23 16:16:39 2013
@@ -30,6 +30,7 @@
<item name="Home" href="index.html" />
<item name="Load Modules" href="modules.html" />
<item name="Bind Services" href="services.html" />
+ <item name="The complete SPI module" href="./all.html" />
<item name="API doc" href="apidocs/index.html" />
</menu>