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/08/01 15:52:29 UTC
svn commit: r1152773 - in
/chemistry/opencmis/branches/server-osgi-enablement:
chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/
chemistry-opencmis-osgi/chemistry-opencmis-osgi-server/
chemistry-opencmis-server/chemistry-opencmis-server-inmemory-...
Author: sklevenz
Date: Mon Aug 1 13:52:28 2011
New Revision: 1152773
URL: http://svn.apache.org/viewvc?rev=1152773&view=rev
Log:
CMIS-400 prepare for merge
Modified:
chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
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-inmemory-war/pom.xml
Modified: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml?rev=1152773&r1=1152772&r2=1152773&view=diff
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml (original)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml Mon Aug 1 13:52:28 2011
@@ -38,18 +38,29 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- !org.apache.chemistry.opencmis.commons.impl.*;version=${project.version},
- org.apache.chemistry.opencmis.client.api.*;version=${project.version},
- org.apache.chemistry.opencmis.client.bindings;version=${project.version},
- org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
- org.apache.chemistry.opencmis.commons.*;version=${project.version}
- </Export-Package>
- <Embed-Dependency>*</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>
+ *;scope=compile,runtime;inline=false
+ </Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive>
+ <Embed-Directory>lib</Embed-Directory>
<Import-Package>
- !*
+ org.apache.log;resolution:=optional,
+ org.apache.avalon.framework.logger;resolution:=optional,
+ org.apache.commons.codec.*;version="[1.4,2.0)",
+ org.apache.commons.logging.*;version="[1.1,2.0)",
+ com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
+ *
</Import-Package>
+ <_exportcontents>
+ org.apache.chemistry.opencmis.client.api.*;version=${project.version},
+ org.apache.chemistry.opencmis.client.bindings;version=${project.version},
+ org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version}
+ org.apache.chemistry.opencmis.commons.impl.*;version=${project.version};-noimport:=true,
+ org.apache.chemistry.opencmis.commons.*;version=${project.version};-noimport:=true,
+ com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional
+ </_exportcontents>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Bundle-Activator>org.apache.chemistry.opencmis.client.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
@@ -74,7 +85,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-client-api</artifactId>
+ <artifactId>chemistry-opencmis-client-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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=1152773&r1=1152772&r2=1152773&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 Mon Aug 1 13:52:28 2011
@@ -25,13 +25,6 @@
<packaging>bundle</packaging>
- <properties>
- <parentBasedir>../../</parentBasedir>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
-
- </properties>
-
<build>
<plugins>
<plugin>
@@ -41,29 +34,35 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></Export-Package>
<Embed-Dependency>
- *;inline=false
+ *;scope=compile,runtime;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,
- !*
+ !org.apache.chemistry.opencmis.client.bindings;version=${project.version},
+ !antlr.collections.impl,
+ !org.antlr.*,
+ org.apache.avalon.framework.logger;resolution:=optional,
+ org.json.simple;resolution:=optional,
+ org.apache.log;resolution:=optional,
+ com.sun.xml.ws.*;resolution:=optional,
+ joptsimple;resolution:=optional,
+ org.apache.commons.codec.*;version="[1.4,2.0)",
+ org.apache.commons.logging.*;version="[1.1,2.0)",
+ org.apache.commons.fileupload.*;version="[1.2.0,2.0)";resolution:=optional,
+ org.apache.commons.lang.*;version="[2.5.0,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
+ com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional
</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
</instructions>
</configuration>
</plugin>
@@ -101,6 +100,11 @@
<artifactId>chemistry-opencmis-test-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.2</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory-war/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory-war/pom.xml?rev=1152773&r1=1152772&r2=1152773&view=diff
==============================================================================
--- chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory-war/pom.xml (original)
+++ chemistry/opencmis/branches/server-osgi-enablement/chemistry-opencmis-server/chemistry-opencmis-server-inmemory-war/pom.xml Mon Aug 1 13:52:28 2011
@@ -1,150 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- 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.
- -->
-
-<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.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>chemistry-opencmis-server-inmemory-war</artifactId>
- <name>OpenCMIS InMemory Server WAR packaging</name>
- <packaging>war</packaging>
-
- <properties>
- <parentBasedir>../../</parentBasedir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Bundle-Name>org.apache.chemistry.opencmis.server.inmemory</Bundle-Name>
- <Bundle-SymbolicName>org.apache.chemistry.opencmis.server.inmemory</Bundle-SymbolicName>
- <Bundle-Version>0.0.1</Bundle-Version>
- <Import-Package>javax.servlet,javax.servlet.http,javax.servlet.resources</Import-Package>
- <Bundle-Classpath>.</Bundle-Classpath>
- <Web-ContextPath>inmemory</Web-ContextPath>
- </manifestEntries>
- </archive>
- <overlays>
- <overlay>
- </overlay>
- <overlay>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-server-bindings-war</artifactId>
- </overlay>
- </overlays>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
+<!-- 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. -->
+
+<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.chemistry.opencmis</groupId>
+ <artifactId>chemistry-opencmis</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>chemistry-opencmis-server-inmemory-war</artifactId>
+ <name>OpenCMIS InMemory Server WAR packaging</name>
+ <packaging>war</packaging>
+
+ <properties>
+ <parentBasedir>../../</parentBasedir>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Name>org.apache.chemistry.opencmis.server.inmemory</Bundle-Name>
+ <Bundle-SymbolicName>org.apache.chemistry.opencmis.server.inmemory</Bundle-SymbolicName>
+ <Bundle-Version>0.0.1</Bundle-Version>
+ <Import-Package>javax.servlet,javax.servlet.http,javax.servlet.resources</Import-Package>
+ <Bundle-Classpath>.</Bundle-Classpath>
+ <Web-ContextPath>inmemory</Web-ContextPath>
+ </manifestEntries>
+ </archive>
+ <overlays>
+ <overlay>
+ </overlay>
+ <overlay>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-server-bindings-war</artifactId>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
- <configuration>
- <wtpversion>2.0</wtpversion>
- <wtpContextName>inmemory</wtpContextName>
- <linkedResources>
- <linkedResource>
- <name>src/main/webapp/WEB-INF/sun-jaxws.xml</name>
- <type>1</type>
- <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/WEB-INF/sun-jaxws.xml</location>
- </linkedResource>
- <linkedResource>
- <name>src/main/webapp/WEB-INF/web.xml</name>
- <type>1</type>
- <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/WEB-INF/web.xml</location>
- </linkedResource>
- <linkedResource>
- <name>src/main/webapp/WEB-INF/wsdl</name>
- <type>2</type>
- <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/WEB-INF/wsdl</location>
- </linkedResource>
- <linkedResource>
- <name>src/main/webapp/css</name>
- <type>2</type>
- <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/css</location>
- </linkedResource>
- <linkedResource>
- <name>src/main/webapp/images</name>
- <type>2</type>
- <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/images</location>
- </linkedResource>
- <linkedResource>
- <name>src/main/webapp/web</name>
- <type>2</type>
- <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web</location>
- </linkedResource>
- </linkedResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-commons-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-commons-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-client-bindings</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-test-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-server-bindings-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-server-support</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>chemistry-opencmis-server-inmemory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <version>3.1.3</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <configuration>
+ <wtpversion>2.0</wtpversion>
+ <wtpContextName>inmemory</wtpContextName>
+ <linkedResources>
+ <linkedResource>
+ <name>src/main/webapp/WEB-INF/sun-jaxws.xml</name>
+ <type>1</type>
+ <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/WEB-INF/sun-jaxws.xml</location>
+ </linkedResource>
+ <linkedResource>
+ <name>src/main/webapp/WEB-INF/web.xml</name>
+ <type>1</type>
+ <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/WEB-INF/web.xml</location>
+ </linkedResource>
+ <linkedResource>
+ <name>src/main/webapp/WEB-INF/wsdl</name>
+ <type>2</type>
+ <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/WEB-INF/wsdl</location>
+ </linkedResource>
+ <linkedResource>
+ <name>src/main/webapp/css</name>
+ <type>2</type>
+ <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/css</location>
+ </linkedResource>
+ <linkedResource>
+ <name>src/main/webapp/images</name>
+ <type>2</type>
+ <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/images</location>
+ </linkedResource>
+ <linkedResource>
+ <name>src/main/webapp/web</name>
+ <type>2</type>
+ <location>WORKSPACE_LOC/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web</location>
+ </linkedResource>
+ </linkedResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-commons-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <artifactId>chemistry-opencmis-commons-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-client-bindings</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-test-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-server-bindings-war</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-server-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-server-inmemory</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>