directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1646192 - in /directory/studio/branches/studio-tycho/plugins: apacheds.configuration.v2/pom-first.xml apacheds.configuration/pom-first.xml common.core/pom-first.xml common.core/pom.xml connection.core/pom-first.xml connection.ui/pom-first.xml
Date Wed, 17 Dec 2014 10:52:43 GMT
Author: elecharny
Date: Wed Dec 17 10:52:42 2014
New Revision: 1646192

URL: http://svn.apache.org/r1646192
Log:
o Added one more pom-first file
o removed the version from the imported packages

Added:
    directory/studio/branches/studio-tycho/plugins/common.core/pom-first.xml
Modified:
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom-first.xml
    directory/studio/branches/studio-tycho/plugins/common.core/pom.xml
    directory/studio/branches/studio-tycho/plugins/connection.core/pom-first.xml
    directory/studio/branches/studio-tycho/plugins/connection.ui/pom-first.xml

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml?rev=1646192&r1=1646191&r2=1646192&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml
(original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml
Wed Dec 17 10:52:42 2014
@@ -54,14 +54,14 @@
  org.apache.directory.studio.apacheds.configuration.v2.jobs,
  org.apache.directory.studio.apacheds.configuration.v2.wizards</Export-Package>
  
-            <Import-Packages>org.apache.directory.server.core.api;version:"${org.apache.directory.server.version}",
- org.apache.directory.server.config;version:"${org.apache.directory.server.version}",
- org.apache.directory.server.config.beans;version:"${org.apache.directory.server.version}",
- org.apache.directory.server.core.api.entry;version:"${org.apache.directory.server.version}",
- org.apache.directory.server.core.api.filtering;version:"${org.apache.directory.server.version}",
- org.apache.directory.server.core.api.interceptor.context;version:"${org.apache.directory.server.version}",
- org.apache.directory.server.core.api.partition;version:"${org.apache.directory.server.version}",
- org.slf4j;version:"${org.slf4j.version}</Import-Packages>
+            <Import-Packages>org.apache.directory.server.core.api,
+ org.apache.directory.server.config,
+ org.apache.directory.server.config.beans,
+ org.apache.directory.server.core.api.entry,
+ org.apache.directory.server.core.api.filtering,
+ org.apache.directory.server.core.api.interceptor.context,
+ org.apache.directory.server.core.api.partition,
+ org.slf4j</Import-Packages>
             
             <Require-Bundle>org.eclipse.core.runtime,
  org.apache.commons.io;bundle-version="${org.apache.commons.io.bundleversion}",

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom-first.xml?rev=1646192&r1=1646191&r2=1646192&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom-first.xml Wed
Dec 17 10:52:42 2014
@@ -56,7 +56,7 @@
  org.apache.directory.studio.apacheds.configuration.model.v156,
  org.apache.directory.studio.apacheds.configuration.model.v157</Export-Package>
  
-            <Import-Packages>org.apache.commons.lang;version:"${org.apache.commons.lang.bundleversion},
+            <Import-Packages>org.apache.commons.lang,
  org.dom4j,
  org.dom4j.io</Import-Packages>
             

Added: directory/studio/branches/studio-tycho/plugins/common.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/common.core/pom-first.xml?rev=1646192&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/common.core/pom-first.xml (added)
+++ directory/studio/branches/studio-tycho/plugins/common.core/pom-first.xml Wed Dec 17 10:52:42
2014
@@ -0,0 +1,71 @@
+<?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>parent-plugins</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../pom-first.xml</relativePath>
+  </parent>
+
+  <artifactId>org.apache.directory.studio.common.core</artifactId>
+  <name>Apache Directory Studio Common Core</name>
+  <description/>
+  <packaging>bundle</packaging>
+
+  <build>
+     <!-- MANIFEST.MF Generation -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+            <Bundle-Localization>plugin</Bundle-Localization>
+            <Eclipse-LazyStart>true</Eclipse-LazyStart>
+            <Bundle-Activator>org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin</Bundle-Activator>
+            
+            <Export-Package>org.apache.directory.studio.common.core.jobs</Export-Package>
+ 
+            <Import-Packages>org.apache.commons.lang</Import-Packages>
+            
+            <Require-Bundle>org.eclipse.core.runtime</Require-Bundle>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
+

Modified: directory/studio/branches/studio-tycho/plugins/common.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/common.core/pom.xml?rev=1646192&r1=1646191&r2=1646192&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/common.core/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/common.core/pom.xml Wed Dec 17 10:52:42
2014
@@ -32,134 +32,4 @@
   <packaging>eclipse-plugin</packaging>
 
   <description />
-
-<!--   <build> -->
-<!--     <resources> -->
-<!--       <resource> -->
-<!--         <directory>src/main/resources</directory> -->
-<!--       </resource> -->
-<!--       <resource> -->
-<!--         <directory>src/main/java</directory> -->
-<!--         <includes> -->
-<!--           <include>**/*.properties</include> -->
-<!--         </includes> -->
-<!--       </resource> -->
-<!--     </resources> -->
-<!--     <plugins> -->
-<!--       <plugin> -->
-<!--         <groupId>org.apache.maven.plugins</groupId> -->
-<!--         <artifactId>maven-eclipse-plugin</artifactId> -->
-<!--         <configuration> -->
-<!--           <skip>false</skip> -->
-<!--           <pde>true</pde> -->
-<!--           <additionalProjectnatures> -->
-<!--             <projectnature>org.eclipse.pde.PluginNature</projectnature>
-->
-<!--             <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-->
-<!--           </additionalProjectnatures> -->
-<!--           <additionalProjects> -->
-<!--             <project>org.apache.directory.studio.connection.core</project>
-->
-<!--           </additionalProjects> -->
-<!--           <classpathContainers> -->
-<!--             <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-->
-<!--             <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
-->
-<!--           </classpathContainers> -->
-<!--         </configuration> -->
-<!--       </plugin> -->
-<!--       <plugin> -->
-<!--         <groupId>org.apache.directory.studio</groupId> -->
-<!--         <artifactId>studio-maven-plugin</artifactId> -->
-<!--         <configuration> -->
-<!--           <skip>false</skip> -->
-<!--           <createManifest>true</createManifest> -->
-<!--         </configuration> -->
-<!--         <executions> -->
-<!--           <execution> -->
-<!--             <goals> -->
-<!--               <goal>prepare-jar-package</goal> -->
-<!--             </goals> -->
-<!--           </execution> -->
-<!--         </executions> -->
-<!--       </plugin> -->
-<!--       <plugin> -->
-<!--         <groupId>org.apache.maven.plugins</groupId> -->
-<!--         <artifactId>maven-jar-plugin</artifactId> -->
-<!--         <configuration> -->
-<!--           <archive> -->
-<!--             <manifestFile>META-INF/MANIFEST.MF</manifestFile> -->
-<!--             <addMavenDescriptor>false</addMavenDescriptor> -->
-<!--           </archive> -->
-<!--         </configuration> -->
-<!--       </plugin> -->
-     <!-- MANIFEST.MF Generation -->
-<!--       <plugin> -->
-<!--         <groupId>org.apache.felix</groupId> -->
-<!--         <artifactId>maven-bundle-plugin</artifactId> -->
-<!--         <extensions>true</extensions> -->
-<!--         <configuration> -->
-<!--           <manifestLocation>META-INF</manifestLocation> -->
-<!--           <instructions> -->
-<!--             <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
-->
-<!--             <Eclipse-RegisterBuddy>org.apache.logging.log4j</Eclipse-RegisterBuddy>
-->
-<!--             <Bundle-Localization>plugin</Bundle-Localization> -->
-<!--             <Eclipse-LazyStart>true</Eclipse-LazyStart> -->
-<!--             <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
-->
-<!--  org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}", -->
-<!--  org.eclipse.core.runtime</Require-Bundle> -->
-<!--             <Export-Package>org.apache.directory.studio.*</Export-Package>
-->
-<!--             <Import-Package>!</Import-Package> -->
-<!--             <Private-Package>!</Private-Package> -->
-<!--           </instructions> -->
-<!--         </configuration> -->
-<!--         <executions> -->
-<!--           <execution> -->
-<!--             <id>generate-manifest</id> -->
-<!--             <phase>process-classes</phase> -->
-<!--             <goals> -->
-<!--               <goal>manifest</goal> -->
-<!--             </goals> -->
-<!--           </execution> -->
-<!--         </executions> -->
-<!--       </plugin> -->
-      <!-- No tests to run -->
-<!--       <plugin> -->
-<!--         <groupId>org.apache.maven.plugins</groupId> -->
-<!--         <artifactId>maven-surefire-plugin</artifactId> -->
-<!--         <configuration> -->
-<!--           <skip>true</skip> -->
-<!--         </configuration> -->
-<!--       </plugin> -->
-<!--     </plugins> -->
-<!--   </build> -->
-
-<!--   <dependencies> -->
-    <!-- Apache Directory Studio library plugins dependencies -->
-<!--     <dependency> -->
-<!--       <groupId>org.apache.directory.studio</groupId> -->
-<!--       <artifactId>org.apache.commons.lang</artifactId> -->
-<!--       <scope>provided</scope> -->
-<!--     </dependency> -->
-
-	<!-- Eclipse plugins dependencies -->
-<!--     <dependency> -->
-<!--       <groupId>org.eclipse.core</groupId> -->
-<!--       <artifactId>runtime</artifactId> -->
-<!--       <scope>provided</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.eclipse</groupId> -->
-<!--       <artifactId>osgi</artifactId> -->
-<!--       <scope>provided</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.eclipse.core</groupId> -->
-<!--       <artifactId>jobs</artifactId> -->
-<!--       <scope>provided</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.eclipse.equinox</groupId> -->
-<!--       <artifactId>common</artifactId> -->
-<!--       <scope>provided</scope> -->
-<!--     </dependency> -->
-<!--   </dependencies> -->
-
 </project>
\ No newline at end of file

Modified: directory/studio/branches/studio-tycho/plugins/connection.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/connection.core/pom-first.xml?rev=1646192&r1=1646191&r2=1646192&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/connection.core/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/connection.core/pom-first.xml Wed Dec 17
10:52:42 2014
@@ -45,7 +45,9 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.connection.core.ConnectionCorePlugin</Bundle-Activator>
+            
             <Export-Package>org.apache.directory.studio.connection.core.*</Export-Package>
+            
             <Require-Bundle>org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
  org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.bundleversion}",
  org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.bundleversion}",
@@ -56,9 +58,10 @@
  org.apache.directory.studio.ldifparser,
  org.eclipse.core.runtime,
  org.eclipse.ui</Require-Bundle>
-            <Import-Package>org.apache.commons.lang;version:"${org.apache.commons.lang.bundleversion},
- org.apache.commons.io;version:"${org.apache.commons.io.bundleversion},
- org.apache.commons.codec.digest;version:"${org.apache.commons.codec.bundleversion},
+            
+            <Import-Package>org.apache.commons.lang,
+ org.apache.commons.io,
+ org.apache.commons.codec.digest,
  org.apache.http.conn.ssl,
  org.dom4j,
  org.dom4j.io</Import-Package>

Modified: directory/studio/branches/studio-tycho/plugins/connection.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/connection.ui/pom-first.xml?rev=1646192&r1=1646191&r2=1646192&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/connection.ui/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/connection.ui/pom-first.xml Wed Dec 17
10:52:42 2014
@@ -66,12 +66,12 @@
  org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}"</Require-Bundle>
             
             <Import-Package>org.apache.commons.lang,
- org.apache.commons.lang.time;version:"${org.apache.commons.lang.bundleversion},
- org.apache.commons.io;version="${org.apache.commons.io.bundleversion}",
- org.apache.commons.codec.binary;version="${org.apache.commons.codec.bundleversion}",
- org.apache.commons.codec.digest;version="${org.apache.commons.codec.bundleversion}",
- org.bouncycastle.asn1;version="${org.bouncycastle.bcprov.jdk15.bundleversion}",
- org.bouncycastle.x509.extension;version="${org.bouncycastle.bcprov.jdk15.bundleversion}"</Import-Package>
+ org.apache.commons.lang.time,
+ org.apache.commons.io,
+ org.apache.commons.codec.binary,
+ org.apache.commons.codec.digest,
+ org.bouncycastle.asn1,
+ org.bouncycastle.x509.extension</Import-Package>
           </instructions>
         </configuration>
         <executions>



Mime
View raw message