You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by sk...@apache.org on 2011/07/27 16:37:12 UTC
svn commit: r1151483 - in
/chemistry/opencmis/branches/server-osgi-enablement:
chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/
chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/
chemistry-opencmis-server/chemistry-opencm...
Author: sklevenz
Date: Wed Jul 27 14:37:09 2011
New Revision: 1151483
URL: http://svn.apache.org/viewvc?rev=1151483&view=rev
Log:
CMIS-400 developing self contained osgi sever bundle
Added:
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/repository.properties
Modified:
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/pom.xml
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml
Modified: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/pom.xml?rev=1151483&r1=1151482&r2=1151483&view=diff
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/pom.xml (original)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/pom.xml Wed Jul 27 14:37:09 2011
@@ -27,6 +27,9 @@
<properties>
<parentBasedir>../../</parentBasedir>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
+
</properties>
<build>
@@ -38,16 +41,29 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.chemistry.opencmis.server.impl;version=${project.version},
- org.apache.chemistry.opencmis.server.impl.atompub;version=${project.version},
- com.sun.xml.ws.transport.http.servlet
- </Export-Package>
- <Embed-Dependency>*</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <Export-Package></Export-Package>
+ <Embed-Dependency>
+ *;inline=false
+ </Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive>
<Import-Package>
+ org.apache.commons.codec.*;version="[1.4,2.0)",
+ org.apache.commons.logging.*;version="[1.1,2.0)",
+ javax.servlet.*;version="[2.5,3.0)",
+ org.apache.commons.lang.*;version="[2.4.0,3.0.0)";resolution:=optional,
+ com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
!*
</Import-Package>
+ <Private-Package>!*</Private-Package>
+ <_exportcontents>
+ org.apache.chemistry.opencmis.commons.impl.*;version=${project.version};-noimport:=true,
+ org.apache.chemistry.opencmis.commons.*;version=${project.version};-noimport:=true,
+ org.apache.chemistry.opencmis.server.shared.*;version=${project.version};-noimport:=true,
+ org.apache.chemistry.opencmis.server.impl.*;version=${project.version};-noimport:=true,
+ org.apache.chemistry.opencmis.inmemory.server.*;version=${project.version};-noimport:=true,
+ com.sun.xml.ws.*;version="[2.1.7,3.0)";-noimport:=true
+ </_exportcontents>
+ <Embed-Directory>lib</Embed-Directory>
</instructions>
</configuration>
</plugin>
@@ -80,6 +96,11 @@
<artifactId>chemistry-opencmis-server-inmemory</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-test-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/repository.properties
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/repository.properties?rev=1151483&view=auto
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/repository.properties (added)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/src/main/resources/repository.properties Wed Jul 27 14:37:09 2011
@@ -0,0 +1,50 @@
+# 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.
+
+class=org.apache.chemistry.opencmis.inmemory.server.InMemoryServiceFactoryImpl
+
+repository.id=dummy-rep
+repository.name=Dummy Repository
+
+# In Memory Settings
+InMemoryServer.RepositoryId=A1
+# InMemoryServer.RepositoryInfoCreatorClass=org.apache.chemistry.opencmis.client.provider.inmemory.UnitTestRepositoryInfo
+InMemoryServer.User=dummyuser
+InMemoryServer.Password=dummysecret
+InMemoryServer.TypesCreatorClass=org.apache.chemistry.opencmis.inmemory.types.DefaultTypeSystemCreator
+
+# settings for init repository with data
+ # enable or disable
+RepositoryFiller.Enable=true
+ # Type id of documents that are created
+RepositoryFiller.DocumentTypeId=ComplexType
+ # Type id of folders that are created
+RepositoryFiller.FolderTypeId=cmis:folder
+ # Number of documents created per folder
+RepositoryFiller.DocsPerFolder=3
+ # Number of folders created per folder
+RepositoryFiller.FolderPerFolder=2
+ # number of folder levels created (depth of hierarchy)
+RepositoryFiller.Depth=3
+ # Size of content for documents (0=do not create content), default=0
+RepositoryFiller.ContentSizeInKB=32
+ # properties to set for a document
+RepositoryFiller.DocumentProperty.0=StringProp
+#RepositoryFiller.DocumentProperty.1=StringPropMV
+ # properties to set for a folder
+#RepositoryFiller.FolderProperty.0=StringFolderProp
+# InMemoryServer.MaxContentSizeKB=4096
+# InMemoryServer.CleanIntervalMinutes=240
+
Modified: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=1151483&r1=1151482&r2=1151483&view=diff
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml (original)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml Wed Jul 27 14:37:09 2011
@@ -29,49 +29,6 @@
<parentBasedir>../../</parentBasedir>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Export-Package>
-<!-- !org.apache.chemistry.opencmis.server.impl.browser.json;version=${project.version} -->
-<!-- !org.apache.chemistry.opencmis.server.impl.browser;version=${project.version} -->
- org.apache.chemistry.opencmis.server.*;version=${project.version}
- </Export-Package>
- <Import-Package>
- !org.json.simple, <!-- not OSGi supported -->
- com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
- *
- </Import-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml?rev=1151483&r1=1151482&r2=1151483&view=diff
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml (original)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml Wed Jul 27 14:37:09 2011
@@ -28,46 +28,6 @@
<parentBasedir>../../</parentBasedir>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.chemistry.opencmis.inmemory.*;version=${project.version}
- </Export-Package>
- <Import-Package>
- org.apache.chemistry.opencmis.commons.*;version="[0.4.0,2.0)",
- *
- </Import-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml?rev=1151483&r1=1151482&r2=1151483&view=diff
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml (original)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml Wed Jul 27 14:37:09 2011
@@ -59,42 +59,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.chemistry.opencmis.server.support.*;version=${project.version}
- </Export-Package>
- <Import-Package>
- org.apache.chemistry.opencmis.commons.*;version="[0.4.0,2.0)",
- org.antlr.*,
- org.apache.commons.logging.*
- </Import-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.3</version>