directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1683896 - in /directory/studio/trunk: ./ p2repositories/ p2repositories/dependencies/ p2repositories/eclipse/ p2repositories/product/ p2repositories/test/ p2repositories/test/studio/ p2repositories/test/studio/update/ p2repositories/test/s...
Date Sat, 06 Jun 2015 12:00:18 GMT
Author: seelmann
Date: Sat Jun  6 12:00:17 2015
New Revision: 1683896

URL: http://svn.apache.org/r1683896
Log:
DIRSTUDIO-1023: Add separate P2 repositories for main artifacts, dependencies, RCP product

Added:
    directory/studio/trunk/p2repositories/   (with props)
    directory/studio/trunk/p2repositories/dependencies/   (with props)
    directory/studio/trunk/p2repositories/dependencies/category.xml
    directory/studio/trunk/p2repositories/dependencies/pom.xml
    directory/studio/trunk/p2repositories/eclipse/   (with props)
    directory/studio/trunk/p2repositories/eclipse/category.xml
    directory/studio/trunk/p2repositories/eclipse/pom.xml
    directory/studio/trunk/p2repositories/pom.xml
    directory/studio/trunk/p2repositories/product/   (with props)
    directory/studio/trunk/p2repositories/product/category.xml
    directory/studio/trunk/p2repositories/product/pom.xml
    directory/studio/trunk/p2repositories/test/
    directory/studio/trunk/p2repositories/test/run.sh   (with props)
    directory/studio/trunk/p2repositories/test/studio/
    directory/studio/trunk/p2repositories/test/studio/update/
    directory/studio/trunk/p2repositories/test/studio/update/compositeArtifacts.xml
    directory/studio/trunk/p2repositories/test/studio/update/compositeContent.xml
    directory/studio/trunk/p2repositories/test/studio/update/product/
    directory/studio/trunk/p2repositories/test/studio/update/product/compositeArtifacts.xml
    directory/studio/trunk/p2repositories/test/studio/update/product/compositeContent.xml
Modified:
    directory/studio/trunk/pom.xml

Propchange: directory/studio/trunk/p2repositories/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun  6 12:00:17 2015
@@ -0,0 +1,15 @@
+target
+maven-eclipse.xml
+lib
+bin
+.externalToolBuilders
+felix-cache
+.project
+.classpath
+.settings
+eclipse-classes
+*.log
+*.iml
+*.ipr
+dependency-reduced-pom.xml
+META-INF

Propchange: directory/studio/trunk/p2repositories/dependencies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun  6 12:00:17 2015
@@ -0,0 +1,15 @@
+target
+maven-eclipse.xml
+lib
+bin
+.externalToolBuilders
+felix-cache
+.project
+.classpath
+.settings
+eclipse-classes
+*.log
+*.iml
+*.ipr
+dependency-reduced-pom.xml
+META-INF

Added: directory/studio/trunk/p2repositories/dependencies/category.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/dependencies/category.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/dependencies/category.xml (added)
+++ directory/studio/trunk/p2repositories/dependencies/category.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,28 @@
+<?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.
+-->
+<site>
+   <!-- Need to add at least one bundle otherwise assemble-repository fails -->
+   <bundle id="org.apache.directory.api.util" version="1.0.0.M30">
+      <category name="org.apache.directory.studio.dependencies"/>
+   </bundle>
+   <category-def name="org.apache.directory.studio.dependencies" label="Apache Directory
Studio Dependencies">
+      <description>
+         Dependencies for Apache Directory Studio, no need to install them.
+      </description>
+   </category-def>
+</site>

Added: directory/studio/trunk/p2repositories/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/dependencies/pom.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/dependencies/pom.xml (added)
+++ directory/studio/trunk/p2repositories/dependencies/pom.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,65 @@
+<?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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+    <artifactId>org.apache.directory.studio.p2repositories-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  
+  <artifactId>org.apache.directory.studio.p2repositories.dependencies</artifactId>
+  <name>Apache Directory Studio P2 Repository Dependencies</name>
+  <packaging>eclipse-repository</packaging>
+
+  <description />
+
+  <build>
+    <plugins>
+      <!-- Mirror ApacheDS/API bundles from target platform -->
+      <plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-p2-extras-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <id>combine</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>mirror</goal>
+            </goals>
+            <configuration>
+              <source>
+                <repository>
+                  <url>${project.baseUri}/../../eclipse-trgt-platform/target/repository</url>
+                </repository>
+              </source>
+              <mirrorMetadataOnly>false</mirrorMetadataOnly>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

Propchange: directory/studio/trunk/p2repositories/eclipse/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun  6 12:00:17 2015
@@ -0,0 +1,15 @@
+target
+maven-eclipse.xml
+lib
+bin
+.externalToolBuilders
+felix-cache
+.project
+.classpath
+.settings
+eclipse-classes
+*.log
+*.iml
+*.ipr
+dependency-reduced-pom.xml
+META-INF

Added: directory/studio/trunk/p2repositories/eclipse/category.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/eclipse/category.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/eclipse/category.xml (added)
+++ directory/studio/trunk/p2repositories/eclipse/category.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,39 @@
+<?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.
+-->
+<site>
+   <feature url="features/org.apache.directory.studio.apacheds.feature_2.0.0.qualifier.jar"
id="org.apache.directory.studio.apacheds.feature" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.ldifeditor.feature_2.0.0.qualifier.jar"
id="org.apache.directory.studio.ldifeditor.feature" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.ldapbrowser.feature_2.0.0.qualifier.jar"
id="org.apache.directory.studio.ldapbrowser.feature" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.schemaeditor.feature_2.0.0.qualifier.jar"
id="org.apache.directory.studio.schemaeditor.feature" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio"/>
+   </feature>
+   <bundle id="org.apache.directory.studio.slf4j-eclipselog" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio"/>
+   </bundle>
+   <category-def name="org.apache.directory.studio" label="Apache Directory Studio">
+      <description>
+         Apache Directory Studio
+      </description>
+   </category-def>
+</site>

Added: directory/studio/trunk/p2repositories/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/eclipse/pom.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/eclipse/pom.xml (added)
+++ directory/studio/trunk/p2repositories/eclipse/pom.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,36 @@
+<?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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+    <artifactId>org.apache.directory.studio.p2repositories-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  
+  <artifactId>org.apache.directory.studio.p2repositories.eclipse</artifactId>
+  <name>Apache Directory Studio P2 Repository Eclipse</name>
+  <packaging>eclipse-repository</packaging>
+
+  <description />
+
+</project>

Added: directory/studio/trunk/p2repositories/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/pom.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/pom.xml (added)
+++ directory/studio/trunk/p2repositories/pom.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,145 @@
+<?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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+    <artifactId>org.apache.directory.studio.parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  
+  <artifactId>org.apache.directory.studio.p2repositories-parent</artifactId>
+  <name>Apache Directory Studio P2 Repositories</name>
+  <packaging>pom</packaging>
+
+  <description />
+
+  <modules>
+    <module>dependencies</module>
+    <module>eclipse</module>
+<!--     <module>product</module> -->
+  </modules>
+
+  <build>
+    <plugins>
+      <!-- Clean META-INF directory with legal files -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}/META-INF</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+
+      <!-- Create the P2 repository -->
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-repository-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <includeAllDependencies>false</includeAllDependencies>
+          <createArtifactRepository>true</createArtifactRepository>
+          <compress>true</compress>
+          <profileProperties>
+            <macosx-bundled>true</macosx-bundled>
+          </profileProperties>
+        </configuration>
+      </plugin>
+
+      <!-- Include license and notice file in P2 repository -->
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <inherited>false</inherited>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/../..</directory>
+                  <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Legal files are put to different folders, don't know how to verify. -->
+      <plugin>
+        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+        <artifactId>tools-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify-legal-files</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify-legal-files</goal>
+            </goals>
+            <configuration>
+              <strict>false</strict>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    
+      <!-- Skip install of applications, it's just a waste of space. -->
+      <plugin>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+       </configuration>
+      </plugin>
+      <!-- Skip deployment of applications, it's just a waste of space. -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+       </configuration>
+      </plugin>
+      <!-- Skip source plugin during release. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: directory/studio/trunk/p2repositories/product/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun  6 12:00:17 2015
@@ -0,0 +1,15 @@
+target
+maven-eclipse.xml
+lib
+bin
+.externalToolBuilders
+felix-cache
+.project
+.classpath
+.settings
+eclipse-classes
+*.log
+*.iml
+*.ipr
+dependency-reduced-pom.xml
+META-INF

Added: directory/studio/trunk/p2repositories/product/category.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/product/category.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/product/category.xml (added)
+++ directory/studio/trunk/p2repositories/product/category.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,33 @@
+<?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.
+-->
+<site>
+   <feature url="features/org.apache.directory.studio.rcp.feature_2.0.0.qualifier.jar"
id="org.apache.directory.studio.rcp.feature" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio.product"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.nls.feature_2.0.0.qualifier.jar"
id="org.apache.directory.studio.nls.feature" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio.product"/>
+   </feature>
+   <bundle id="org.apache.directory.studio.slf4j-eclipselog" version="2.0.0.qualifier">
+      <category name="org.apache.directory.studio.product"/>
+   </bundle>
+   <category-def name="org.apache.directory.studio.product" label="Apache Directory Studio
Product">
+      <description>
+         Apache Directory Studio Product
+      </description>
+   </category-def>
+</site>

Added: directory/studio/trunk/p2repositories/product/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/product/pom.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/product/pom.xml (added)
+++ directory/studio/trunk/p2repositories/product/pom.xml Sat Jun  6 12:00:17 2015
@@ -0,0 +1,36 @@
+<?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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+    <artifactId>org.apache.directory.studio.p2repositories-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  
+  <artifactId>org.apache.directory.studio.p2repositories.product</artifactId>
+  <name>Apache Directory Studio P2 Repository Product</name>
+  <packaging>eclipse-repository</packaging>
+
+  <description />
+
+</project>

Added: directory/studio/trunk/p2repositories/test/run.sh
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/test/run.sh?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/test/run.sh (added)
+++ directory/studio/trunk/p2repositories/test/run.sh Sat Jun  6 12:00:17 2015
@@ -0,0 +1,29 @@
+#!/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.
+
+# Test update site
+
+set -e
+
+mkdir -p studio/update/M9
+ln -sf ../../../../dependencies/target/repository studio/update/M9/dependencies
+ln -sf ../../../../eclipse/target/repository studio/update/M9/eclipse
+ln -sf ../../../../product/target/repository studio/update/M9/product
+
+sudo python3 -m http.server 80
+

Propchange: directory/studio/trunk/p2repositories/test/run.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: directory/studio/trunk/p2repositories/test/studio/update/compositeArtifacts.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/test/studio/update/compositeArtifacts.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/test/studio/update/compositeArtifacts.xml (added)
+++ directory/studio/trunk/p2repositories/test/studio/update/compositeArtifacts.xml Sat Jun
 6 12:00:17 2015
@@ -0,0 +1,29 @@
+<?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.
+-->
+<?compositeArtifactRepository version="1.0.0"?>
+<repository name="Apache Directory Studio"
+  type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository"
+  version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="3333" />
+  </properties>
+  <children size="2">
+    <child location="M9/eclipse" />
+    <child location="M9/dependencies" />
+  </children>
+</repository>
\ No newline at end of file

Added: directory/studio/trunk/p2repositories/test/studio/update/compositeContent.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/test/studio/update/compositeContent.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/test/studio/update/compositeContent.xml (added)
+++ directory/studio/trunk/p2repositories/test/studio/update/compositeContent.xml Sat Jun
 6 12:00:17 2015
@@ -0,0 +1,29 @@
+<?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.
+-->
+<?compositeMetadataRepository version="1.0.0"?>
+<repository name="Apache Directory Studio"
+  type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository"
+  version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="3333" />
+  </properties>
+  <children size="2">
+    <child location="M9/eclipse" />
+    <child location="M9/dependencies" />
+  </children>
+</repository>
\ No newline at end of file

Added: directory/studio/trunk/p2repositories/test/studio/update/product/compositeArtifacts.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/test/studio/update/product/compositeArtifacts.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/test/studio/update/product/compositeArtifacts.xml
(added)
+++ directory/studio/trunk/p2repositories/test/studio/update/product/compositeArtifacts.xml
Sat Jun  6 12:00:17 2015
@@ -0,0 +1,30 @@
+<?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.
+-->
+<?compositeArtifactRepository version="1.0.0"?>
+<repository name="Apache Directory Studio"
+  type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository"
+  version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="3333" />
+  </properties>
+  <children size="2">
+    <child location="../M9/eclipse" />
+    <child location="../M9/dependencies" />
+<!--     <child location="../M9/product" /> -->
+  </children>
+</repository>
\ No newline at end of file

Added: directory/studio/trunk/p2repositories/test/studio/update/product/compositeContent.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repositories/test/studio/update/product/compositeContent.xml?rev=1683896&view=auto
==============================================================================
--- directory/studio/trunk/p2repositories/test/studio/update/product/compositeContent.xml
(added)
+++ directory/studio/trunk/p2repositories/test/studio/update/product/compositeContent.xml
Sat Jun  6 12:00:17 2015
@@ -0,0 +1,30 @@
+<?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.
+-->
+<?compositeMetadataRepository version="1.0.0"?>
+<repository name="Apache Directory Studio"
+  type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository"
+  version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="3333" />
+  </properties>
+  <children size="2">
+    <child location="../M9/eclipse" />
+    <child location="../M9/dependencies" />
+<!--     <child location="../M9/product" /> -->
+  </children>
+</repository>
\ No newline at end of file

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1683896&r1=1683895&r2=1683896&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Sat Jun  6 12:00:17 2015
@@ -118,7 +118,7 @@
     <module>helps</module>
     <module>features</module>
     <module>tests</module>
-    <module>p2repository</module>
+    <module>p2repositories</module>
     <module>product</module>
   </modules>
 



Mime
View raw message