chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject svn commit: r920416 - in /incubator/chemistry/trunk/opencmis: opencmis-client/opencmis-client-impl/ opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/ opencmis-client/opencmis-client-impl/src/test/java/org/apache/ope...
Date Mon, 08 Mar 2010 17:35:56 GMT
Author: sklevenz
Date: Mon Mar  8 17:35:55 2010
New Revision: 920416

URL: http://svn.apache.org/viewvc?rev=920416&view=rev
Log:
https://issues.apache.org/jira/browse/CMIS-124

* MANIFEST.MF extended for OSGi enabling for all WAR build goals
* Client API test suite extended to run parameterized maven test phase (mvn test -D...)
* Cleanup/Refactoring Junit Tests for Client API

Removed:
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/LogReportTest.java
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/suite/AbstractCmisTestSuite.java
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/suite/GenericTestSuite.java
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/suite/mock/
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/suite/otx/
Modified:
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/pom.xml
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
    incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
    incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-fileshare/pom.xml
    incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-inmemory/pom.xml
    incubator/chemistry/trunk/opencmis/opencmis-test/opencmis-test-browser-app/pom.xml

Modified: incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/pom.xml?rev=920416&r1=920415&r2=920416&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/pom.xml (original)
+++ incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/pom.xml Mon Mar
 8 17:35:55 2010
@@ -1,70 +1,96 @@
 <?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
+	<!--
+		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.opencmis</groupId>
-    <artifactId>opencmis</artifactId>
-    <version>0.1-SNAPSHOT</version>
-	<relativePath>../../pom.xml</relativePath>	
-  </parent>
-  
-  <artifactId>opencmis-client-impl</artifactId>
-  <name>OpenCMIS Client Implementation</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-client-api</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-commons-api</artifactId>
-      <version>${version}</version>
-    </dependency>
-	<dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-commons-impl</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-provider-impl</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-    	<groupId>org.easymock</groupId>
-    	<artifactId>easymock</artifactId>
-    	<version>2.5.2</version>
-    	<scope>test</scope>
-    </dependency> 
-    <dependency>
-    	<groupId>org.opencmis</groupId>
-    	<artifactId>opencmis-test-util</artifactId>
-    	<version>0.1-SNAPSHOT</version>
-    	<type>jar</type>
-    	<scope>compile</scope>
-    </dependency>
-  </dependencies>
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.opencmis</groupId>
+		<artifactId>opencmis</artifactId>
+		<version>0.1-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>opencmis-client-impl</artifactId>
+	<name>OpenCMIS Client Implementation</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-client-api</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-commons-api</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-commons-impl</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-provider-impl</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>2.5.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-test-util</artifactId>
+			<version>0.1-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<!--
+				call mvn test
+				-Dorg.apache.opencmis.client.runtime.suite.config.path=myServer.properties
+				to run test using profile parameters
+			-->
+			<activation>
+				<property>
+					<name>org.apache.opencmis.client.runtime.suite.config.path</name>
+				</property>
+			</activation>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-surefire-plugin</artifactId>
+							<configuration>
+								<argLine>-Dorg.apache.opencmis.client.runtime.suite.config.path=${org.apache.opencmis.client.runtime.suite.config.path}</argLine>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
+	</profiles>
 
 </project>

Modified: incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java?rev=920416&r1=920415&r2=920416&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
(original)
+++ incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
Mon Mar  8 17:35:55 2010
@@ -18,35 +18,60 @@
  */
 package org.apache.opencmis.client.runtime;
 
+import java.io.IOException;
+import java.util.Properties;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.PropertyConfigurator;
 import org.apache.opencmis.client.api.Session;
 import org.apache.opencmis.client.api.SessionFactory;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 
 /**
  * Create a OpenCMIS test session based on fixture parameter.
  */
 public abstract class AbstractSessionTest {
 
-  protected Log log = LogFactory.getLog(this.getClass());
+	protected Log log = LogFactory.getLog(this.getClass());
 
-  /**
-   * test session
-   */
-  protected Session session = null;
-
-  @Before
-  public void setUp() throws Exception {
-    SessionFactory factory = Fixture.getSessionFactory();
-    this.session = factory.createSession(Fixture.getParamter());
-
-    Fixture.setUpTestData(this.session);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    Fixture.teardownTestData(this.session);
-  }
+	@BeforeClass
+	public static void classSetup() {
+		AbstractSessionTest.initializeLogging();
+		Fixture.logHeader();
+	}
+
+	/**
+	 * Initialize logging support.
+	 */
+	private static void initializeLogging() {
+		Properties p = new Properties();
+		try {
+			p.load(AbstractSessionTest.class
+					.getResourceAsStream("/log4j.properties"));
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		PropertyConfigurator.configure(p);
+	}
+
+	/**
+	 * test session
+	 */
+	protected Session session = null;
+
+	@Before
+	public void setUp() throws Exception {
+		SessionFactory factory = Fixture.getSessionFactory();
+		this.session = factory.createSession(Fixture.getParamter());
+
+		Fixture.setUpTestData(this.session);
+	}
+
+	@After
+	public void tearDown() throws Exception {
+		Fixture.teardownTestData(this.session);
+	}
 }

Modified: incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java?rev=920416&r1=920415&r2=920416&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
(original)
+++ incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
Mon Mar  8 17:35:55 2010
@@ -31,6 +31,8 @@
 import java.util.UUID;
 import java.util.Map.Entry;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.opencmis.client.api.Session;
 import org.apache.opencmis.client.api.SessionFactory;
 import org.apache.opencmis.client.api.util.Testable;
@@ -44,6 +46,8 @@
  */
 public class Fixture {
 
+	private static Log log = LogFactory.getLog(Fixture.class);
+
 	public static String PROPERTY_FILTER = "*";
 	/*
 	 * general
@@ -162,7 +166,7 @@
 	public static void init() {
 		/* get optional path from system properties */
 		String pathname = System.getProperty(Fixture.CONFIG_PATH);
-		pathname = (pathname != null) ? pathname.trim() : null; 
+		pathname = (pathname != null) ? pathname.trim() : null;
 		Properties properties = null;
 		Map<String, String> sessionParameter = null;
 		SessionFactory factory = null;
@@ -203,14 +207,12 @@
 				factory = SessionFactoryImpl.newInstance();
 			}
 			Fixture.setSessionFactory(factory);
-		} catch (InstantiationException e) {
-			throw new CmisRuntimeException(factoryClassName, e);
-		} catch (IllegalAccessException e) {
-			throw new CmisRuntimeException(factoryClassName, e);
-		} catch (ClassNotFoundException e) {
-			throw new CmisRuntimeException(factoryClassName, e);
 		} catch (IOException e) {
+			Fixture.log.error(pathname, e);
 			throw new CmisRuntimeException(pathname, e);
+		} catch (Exception e) {
+			Fixture.log.error(factoryClassName, e);
+			throw new CmisRuntimeException(factoryClassName, e);
 		}
 	}
 
@@ -230,4 +232,31 @@
 			((Testable) session).cleanUpTestData();
 		}
 	}
+
+	private static boolean isLogged = false;
+
+	public static void logHeader() {
+		if (!Fixture.isLogged) {
+			/*
+			 * log header only once
+			 */
+			Fixture.log
+					.info("---------------------------------------------------------------");
+			Fixture.log
+					.info("--- OpenCMIS Client Test Suite --------------------------------");
+			Fixture.log
+					.info("---------------------------------------------------------------");
+			Fixture.log.info("config path (prop): "
+					+ System.getProperty(Fixture.CONFIG_PATH));
+			Fixture.log.info("session factory:    "
+					+ Fixture.getSessionFactory().getClass());
+			Fixture.log.info("session parameter:  " + Fixture.getParamter());
+
+			Fixture.log
+					.info("---------------------------------------------------------------");
+
+			Fixture.isLogged = true;
+		}
+	}
+
 }

Modified: incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-fileshare/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-fileshare/pom.xml?rev=920416&r1=920415&r2=920416&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-fileshare/pom.xml (original)
+++ incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-fileshare/pom.xml Mon
Mar  8 17:35:55 2010
@@ -1,83 +1,94 @@
 <?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
+	<!--
+		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.opencmis</groupId>
-    <artifactId>opencmis</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  
-  <artifactId>opencmis-server-fileshare</artifactId>
-  <name>OpenCMIS FileShare Server Implementation</name>
-  <packaging>war</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <overlays>
-            <overlay>
-            </overlay>
-            <overlay>
-              <groupId>org.opencmis</groupId>
-              <artifactId>opencmis-server-impl</artifactId>
-            </overlay>
-          </overlays>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-commons-api</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-commons-impl</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-server-spi</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-server-impl</artifactId>
-      <version>${version}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-server-support</artifactId>
-      <version>${version}</version>
-    </dependency>
-  </dependencies>
-  
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.opencmis</groupId>
+		<artifactId>opencmis</artifactId>
+		<version>0.1-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>opencmis-server-fileshare</artifactId>
+	<name>OpenCMIS FileShare Server Implementation</name>
+	<packaging>war</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archive>
+						<!--
+							OSGi Bundle Support
+						-->
+						<manifestEntries>
+							<Bundle-Name>org.apache.opencmis.server.filesahre</Bundle-Name>
+							<Bundle-SymbolicName>org.apache.opencmis.server.fileshare</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>fileshare</Web-ContextPath>
+						</manifestEntries>
+					</archive>
+					<overlays>
+						<overlay>
+						</overlay>
+						<overlay>
+							<groupId>org.opencmis</groupId>
+							<artifactId>opencmis-server-impl</artifactId>
+						</overlay>
+					</overlays>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-commons-api</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-commons-impl</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-server-spi</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-server-impl</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-server-support</artifactId>
+			<version>${version}</version>
+		</dependency>
+	</dependencies>
+
 </project>

Modified: incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-inmemory/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-inmemory/pom.xml?rev=920416&r1=920415&r2=920416&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-inmemory/pom.xml (original)
+++ incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-inmemory/pom.xml Mon
Mar  8 17:35:55 2010
@@ -1,93 +1,105 @@
 <?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
+	<!--
+		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.opencmis</groupId>
-    <artifactId>opencmis</artifactId>
-    <version>0.1-SNAPSHOT</version>
-	<relativePath>../../pom.xml</relativePath>		
-  </parent>
-  
-  <artifactId>opencmis-server-inmemory</artifactId>
-  <name>OpenCMIS InMemory Server Implementation</name>
-  <packaging>war</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <overlays>
-            <overlay>
-            </overlay>
-            <overlay>
-              <groupId>org.opencmis</groupId>
-              <artifactId>opencmis-server-impl</artifactId>
-            </overlay>
-          </overlays>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-commons-api</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-commons-impl</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-provider-impl</artifactId>
-      <version>${version}</version>
-    </dependency>	
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-server-spi</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-test-util</artifactId>
-      <version>${version}</version>
-    </dependency>
-	<dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-server-impl</artifactId>
-      <version>${version}</version>
-	  <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-server-support</artifactId>
-      <version>${version}</version>
-    </dependency>
-  </dependencies>
-  
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.opencmis</groupId>
+		<artifactId>opencmis</artifactId>
+		<version>0.1-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>opencmis-server-inmemory</artifactId>
+	<name>OpenCMIS InMemory Server Implementation</name>
+	<packaging>war</packaging>
+
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archive>
+						<!--
+							OSGi Bundle Support
+						-->
+						<manifestEntries>
+							<Bundle-Name>org.apache.opencmis.server.inmemory</Bundle-Name>
+							<Bundle-SymbolicName>org.apache.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>org.opencmis</groupId>
+							<artifactId>opencmis-server-impl</artifactId>
+						</overlay>
+					</overlays>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-commons-api</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-commons-impl</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-provider-impl</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-server-spi</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-test-util</artifactId>
+			<version>${version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-server-impl</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-server-support</artifactId>
+			<version>${version}</version>
+		</dependency>
+	</dependencies>
+
 </project>

Modified: incubator/chemistry/trunk/opencmis/opencmis-test/opencmis-test-browser-app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-test/opencmis-test-browser-app/pom.xml?rev=920416&r1=920415&r2=920416&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-test/opencmis-test-browser-app/pom.xml (original)
+++ incubator/chemistry/trunk/opencmis/opencmis-test/opencmis-test-browser-app/pom.xml Mon
Mar  8 17:35:55 2010
@@ -1,49 +1,81 @@
 <?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
+	<!--
+		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.opencmis</groupId>
-    <artifactId>opencmis</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  
-  <artifactId>opencmis-test-browser-app</artifactId>
-  <name>OpenCMIS Browser Application</name>
-  <packaging>war</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opencmis</groupId>
-      <artifactId>opencmis-test-browser</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.opencmis</groupId>
+		<artifactId>opencmis</artifactId>
+		<version>0.1-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>opencmis-test-browser-app</artifactId>
+	<name>OpenCMIS Browser Application</name>
+	<packaging>war</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archive>
+						<!--
+							OSGi Bundle Support
+						-->
+						<manifestEntries>
+							<Bundle-Name>org.apache.opencmis.browser</Bundle-Name>
+							<Bundle-SymbolicName>org.apache.opencmis.browser</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>browser</Web-ContextPath>
+						</manifestEntries>
+					</archive>
+					<overlays>
+						<overlay>
+						</overlay>
+						<overlay>
+							<groupId>org.opencmis</groupId>
+							<artifactId>opencmis-test-browser</artifactId>
+						</overlay>
+					</overlays>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>org.opencmis</groupId>
+			<artifactId>opencmis-test-browser</artifactId>
+			<version>${version}</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 </project>
\ No newline at end of file



Mime
View raw message