directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r593574 - in /directory/sandbox/felixk/studio-schemaeditor: .project META-INF/MANIFEST.MF pom.xml
Date Fri, 09 Nov 2007 15:57:39 GMT
Author: felixk
Date: Fri Nov  9 07:57:38 2007
New Revision: 593574

URL: http://svn.apache.org/viewvc?rev=593574&view=rev
Log:
.project, .classpath generation via eclipse plugin

Removed:
    directory/sandbox/felixk/studio-schemaeditor/.project
Modified:
    directory/sandbox/felixk/studio-schemaeditor/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-schemaeditor/pom.xml

Modified: directory/sandbox/felixk/studio-schemaeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor/META-INF/MANIFEST.MF?rev=593574&r1=593573&r2=593574&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-schemaeditor/META-INF/MANIFEST.MF Fri Nov  9 07:57:38
2007
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.apache.directory.studio.schemaeditor;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.apache.directory.studio.schemaeditor.Activator
-Bundle-Vendor: Apache Software Foundation
+Bundle-Vendor: The Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,
@@ -15,8 +15,8 @@
  org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.jars
 Eclipse-LazyStart: true
-Bundle-ClassPath: .,
- lib/apacheds-core-plugin-1.5.2-SNAPSHOT.jar,
- lib/shared-converter-0.9.7-SNAPSHOT.jar
 Export-Package: org.apache.directory.studio.schemaeditor.model,
  org.apache.directory.studio.schemaeditor.model.io
+Bundle-ClassPath: .,
+ apacheds-core-plugin-1.5.2-SNAPSHOT.jar,
+ shared-converter-0.9.7-SNAPSHOT.jar

Modified: directory/sandbox/felixk/studio-schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor/pom.xml?rev=593574&r1=593573&r2=593574&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor/pom.xml Fri Nov  9 07:57:38 2007
@@ -39,43 +39,6 @@
         <local-repo>${project.basedir}/../local-repository</local-repo>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>prepare-for-eclipse</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>prepare-for-eclipse</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>lib</outputDirectory>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.apache.directory.shared</groupId>
-                                            <artifactId>shared-converter</artifactId>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.apache.directory.server</groupId>
-                                            <artifactId>apacheds-core-plugin</artifactId>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <resources>
             <resource>
@@ -94,6 +57,18 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <configuration>
+                    <pde>true</pde>
+                    <projectnatures>
+                        <projectnature>org.eclipse.pde.PluginNature</projectnature>
+                        <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+                    </projectnatures>
+                </configuration>
+            </plugin>
+            <!-- Need to export any dependencies?
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
@@ -104,7 +79,7 @@
                         </goals>
                         <configuration>
                             <overWrite>true</overWrite>
-                            <outputDirectory>target/classes/lib</outputDirectory>
+                            <outputDirectory>target/classes</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>commons-collections</groupId>
@@ -143,6 +118,7 @@
                     </execution>
                 </executions>
             </plugin>
+             -->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -214,11 +190,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-converter</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.ui</artifactId>
             <scope>provided</scope>
@@ -266,7 +237,51 @@
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-core-plugin</artifactId>
-            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>maven-plugin-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>maven-project</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>antlr</groupId>
+                    <artifactId>antlr</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.directory.server</groupId>
+                    <artifactId>apacheds-core-shared</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.directory.shared</groupId>
+                    <artifactId>shared-ldap</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion></exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.directory.shared</groupId>
+            <artifactId>shared-converter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>antlr</groupId>
+                    <artifactId>antlr</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.directory.shared</groupId>
+                    <artifactId>shared-ldap</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>



Mime
View raw message