You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by si...@apache.org on 2012/02/15 21:17:30 UTC
svn commit: r1244683 - in /incubator/directmemory/trunk: ./ examples/
integrations/ integrations/solr/
serializers/protostuff/src/main/java/org/apache/directmemory/serialization/
serializers/protostuff/src/test/java/org/apache/directmemory/serialization/
Author: simonetripodi
Date: Wed Feb 15 20:17:30 2012
New Revision: 1244683
URL: http://svn.apache.org/viewvc?rev=1244683&view=rev
Log:
relocated Apache Solr integration, from examples to integrations
Added:
incubator/directmemory/trunk/integrations/
incubator/directmemory/trunk/integrations/pom.xml (with props)
incubator/directmemory/trunk/integrations/solr/
- copied from r1244199, incubator/directmemory/trunk/examples/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/package-info.java
- copied unchanged from r1244587, incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
Removed:
incubator/directmemory/trunk/examples/
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
Modified:
incubator/directmemory/trunk/integrations/solr/pom.xml
incubator/directmemory/trunk/pom.xml
Added: incubator/directmemory/trunk/integrations/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/pom.xml?rev=1244683&view=auto
==============================================================================
--- incubator/directmemory/trunk/integrations/pom.xml (added)
+++ incubator/directmemory/trunk/integrations/pom.xml Wed Feb 15 20:17:30 2012
@@ -0,0 +1,50 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-parent</artifactId>
+ <version>0.5.5-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-platforms</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache DirectMemory :: Integrations</name>
+ <description>${project.name}</description>
+
+ <modules>
+ <module>solr</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>directmemory-cache</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/directmemory/trunk/integrations/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/integrations/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/directmemory/trunk/integrations/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/directmemory/trunk/integrations/solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/solr/pom.xml?rev=1244683&r1=1244199&r2=1244683&view=diff
==============================================================================
--- incubator/directmemory/trunk/integrations/solr/pom.xml (original)
+++ incubator/directmemory/trunk/integrations/solr/pom.xml Wed Feb 15 20:17:30 2012
@@ -24,13 +24,13 @@ under the License.
<parent>
<groupId>org.apache.directmemory</groupId>
- <artifactId>directmemory-parent</artifactId>
+ <artifactId>directmemory-platforms</artifactId>
<version>0.5.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <artifactId>directmemory-examples</artifactId>
- <name>Apache DirectMemory :: Examples</name>
+ <artifactId>directmemory-solr</artifactId>
+ <name>Apache DirectMemory :: Integrations :: Apache Solr</name>
<packaging>bundle</packaging>
<properties>
@@ -41,7 +41,6 @@ under the License.
<osgi.export>org.apache.directmemory.examples.*;version="${project.version}</osgi.export>
</properties>
-
<build>
<plugins>
<plugin>
@@ -72,32 +71,27 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directmemory</groupId>
- <artifactId>directmemory-cache</artifactId>
- <version>0.5.5-SNAPSHOT</version>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>3.5.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>3.5.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<version>3.5.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/directmemory/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/pom.xml?rev=1244683&r1=1244682&r2=1244683&view=diff
==============================================================================
--- incubator/directmemory/trunk/pom.xml (original)
+++ incubator/directmemory/trunk/pom.xml Wed Feb 15 20:17:30 2012
@@ -194,9 +194,9 @@ under the License.
<modules>
<module>directmemory-cache</module>
<module>platforms</module>
+ <module>integrations</module>
<module>serializers/protostuff</module>
<module>itests</module>
- <module>examples</module>
</modules>
<scm>