directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1650803 - in /directory/studio/branches/studio-tycho: features/ldifeditor.feature/build.properties features/ldifeditor.feature/feature.xml features/ldifeditor.feature/pom.xml features/pom.xml pom.xml
Date Sat, 10 Jan 2015 20:04:40 GMT
Author: seelmann
Date: Sat Jan 10 20:04:40 2015
New Revision: 1650803

URL: http://svn.apache.org/r1650803
Log:
Migrate first feature.

Added:
    directory/studio/branches/studio-tycho/features/ldifeditor.feature/build.properties
Modified:
    directory/studio/branches/studio-tycho/features/ldifeditor.feature/feature.xml
    directory/studio/branches/studio-tycho/features/ldifeditor.feature/pom.xml
    directory/studio/branches/studio-tycho/features/pom.xml
    directory/studio/branches/studio-tycho/pom.xml

Added: directory/studio/branches/studio-tycho/features/ldifeditor.feature/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/ldifeditor.feature/build.properties?rev=1650803&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/features/ldifeditor.feature/build.properties (added)
+++ directory/studio/branches/studio-tycho/features/ldifeditor.feature/build.properties Sat
Jan 10 20:04:40 2015
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               studio.png,\
+               META-INF/*
\ No newline at end of file

Modified: directory/studio/branches/studio-tycho/features/ldifeditor.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/ldifeditor.feature/feature.xml?rev=1650803&r1=1650802&r2=1650803&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/features/ldifeditor.feature/feature.xml (original)
+++ directory/studio/branches/studio-tycho/features/ldifeditor.feature/feature.xml Sat Jan
10 20:04:40 2015
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.ldifeditor.feature"
       label="Apache Directory Studio LDIF Editor"
-      version="${pom.version}"
+      version="2.0.0.qualifier"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.ldifeditor"
       image="studio.png">
@@ -213,261 +213,261 @@ http://www.apache.org/licenses/
    </requires>
 
    <plugin
-         id="org.antlr.antlr"
+         id="org.apache.servicemix.bundles.antlr"
          download-size="0"
          install-size="0"
-         version="${org.antlr.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.codec"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.codec.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.collections.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.io"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.io.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.lang"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.lang.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.logging.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.pool"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.pool.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.asn1.api"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.asn1.ber"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.dsmlv2.parser"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.i18n"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.client.api"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.codec.core"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.extras.aci"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.model"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.net.mina"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.schema"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.util"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.aciitemeditor"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.common.core"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.core"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.ui"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.common"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.core"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifeditor"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifeditor.help"
          download-size="0"
          install-size="0"
-         version="${pom.version}"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.apache.directory.studio.ldifparser"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.valueeditors"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.httpcomponents.httpclient"
          download-size="0"
          install-size="0"
-         version="${org.apache.httpcomponents.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.httpcomponents.httpcore"
          download-size="0"
          install-size="0"
-         version="${org.apache.httpcomponents.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.logging.log4j"
+         id="log4j"
          download-size="0"
          install-size="0"
-         version="${org.apache.logging.log4j.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
          id="org.apache.mina.core"
          download-size="0"
          install-size="0"
-         version="${org.apache.mina.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.bouncycastle.bcprov.jdk15"
+         id="bcprov"
          download-size="0"
          install-size="0"
-         version="${org.bouncycastle.bcprov.jdk15.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.dom4j.dom4j"
+         id="org.apache.servicemix.bundles.dom4j"
          download-size="0"
          install-size="0"
-         version="${org.dom4j.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.slf4j.api"
+         id="slf4j.api"
          download-size="0"
          install-size="0"
-         version="${org.slf4j.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.xpp3.xpp3"
+         id="org.apache.servicemix.bundles.xpp3"
          download-size="0"
          install-size="0"
-         version="${org.xpp3.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>

Modified: directory/studio/branches/studio-tycho/features/ldifeditor.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/ldifeditor.feature/pom.xml?rev=1650803&r1=1650802&r2=1650803&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/features/ldifeditor.feature/pom.xml (original)
+++ directory/studio/branches/studio-tycho/features/ldifeditor.feature/pom.xml Sat Jan 10
20:04:40 2015
@@ -24,103 +24,12 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>ldifeditor.feature</artifactId>
+  <artifactId>org.apache.directory.studio.ldifeditor.feature</artifactId>
   <name>Apache Directory Studio LDIF Editor Feature</name>
-  <packaging>jar</packaging>
+  <packaging>eclipse-feature</packaging>
 
   <description />
-  
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>feature.xml</include>
-          <include>studio.png</include>
-        </includes>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-          <projectnatures>
-            <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-          </projectnatures>
-          <buildcommands>
-            <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-          </buildcommands>
-        </configuration>
-      </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>
-      <plugin>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>studio-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <createManifest>true</createManifest>
-        </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>
-            <Bundle-Localization>plugin</Bundle-Localization>
-            <Eclipse-LazyStart>true</Eclipse-LazyStart>
-            <Export-Package>!</Export-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>
-
 </project>
\ No newline at end of file

Modified: directory/studio/branches/studio-tycho/features/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/pom.xml?rev=1650803&r1=1650802&r2=1650803&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/features/pom.xml (original)
+++ directory/studio/branches/studio-tycho/features/pom.xml Sat Jan 10 20:04:40 2015
@@ -31,14 +31,14 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>apacheds.configuration.feature</module>
-    <module>apacheds.configuration.v2.feature</module>
-    <module>apacheds.feature</module>
-    <module>ldapbrowser.feature</module>
-    <module>ldapservers.feature</module>
+<!--     <module>apacheds.configuration.feature</module> -->
+<!--     <module>apacheds.configuration.v2.feature</module> -->
+<!--     <module>apacheds.feature</module> -->
+<!--     <module>ldapbrowser.feature</module> -->
+<!--     <module>ldapservers.feature</module> -->
     <module>ldifeditor.feature</module>
-    <module>rcp.feature</module>
-    <module>schemaeditor.feature</module>
+<!--     <module>rcp.feature</module> -->
+<!--     <module>schemaeditor.feature</module> -->
   </modules>
   
 </project>

Modified: directory/studio/branches/studio-tycho/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/pom.xml?rev=1650803&r1=1650802&r2=1650803&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/pom.xml (original)
+++ directory/studio/branches/studio-tycho/pom.xml Sat Jan 10 20:04:40 2015
@@ -124,6 +124,7 @@
   <modules>
     <module>plugins</module>
     <module>helps</module>
+    <module>features</module>
   </modules>
 
   <build>



Mime
View raw message