directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r359946 - in /directory/trunk: ./ apacheds-plugin/ apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/ apacheds-shared/ apacheds/plugin/
Date Fri, 30 Dec 2005 00:25:52 GMT
Author: akarasulu
Date: Thu Dec 29 16:25:47 2005
New Revision: 359946

URL: http://svn.apache.org/viewcvs?rev=359946&view=rev
Log:
working on new m2 plugin ... checkpointing ... plugin does not work

Added:
    directory/trunk/apacheds-plugin/   (props changed)
      - copied from r359915, directory/trunk/apacheds/plugin/
    directory/trunk/apacheds-plugin/pom.xml
    directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
  (with props)
Removed:
    directory/trunk/apacheds-plugin/maven.xml
    directory/trunk/apacheds-shared/project.properties
    directory/trunk/apacheds-shared/project.xml
    directory/trunk/apacheds/plugin/
Modified:
    directory/trunk/apacheds-plugin/project.properties
    directory/trunk/apacheds-shared/   (props changed)
    directory/trunk/todo.txt

Propchange: directory/trunk/apacheds-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 29 16:25:47 2005
@@ -0,0 +1,12 @@
+target
+.deployables
+.wtpmodules
+.settings
+jaxb
+.classpath
+.project
+*.ser
+*.log
+*.iml
+*.iws
+*.ipr

Added: directory/trunk/apacheds-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-plugin/pom.xml?rev=359946&view=auto
==============================================================================
--- directory/trunk/apacheds-plugin/pom.xml (added)
+++ directory/trunk/apacheds-plugin/pom.xml Thu Dec 29 16:25:47 2005
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.ldap.server</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.4-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.apache.ldap.server.plugin</artifactId>
+  <name>apacheds-plugin</name>
+  <packaging>maven-plugin</packaging>  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.5.3-1</version>
+    </dependency>
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>2.7.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ldap.server</groupId>
+      <artifactId>org.apache.ldap.server.shared</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>velocity</groupId>
+      <artifactId>velocity-dep</artifactId>
+      <version>1.4</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.ldap.server</groupId>
+        <artifactId>org.apache.ldap.server.plugin</artifactId>
+        <configuration>
+          <schemaSourcesDir>src/main/schema</schemaSourcesDir>
+        </configuration>
+
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antlr-plugin</artifactId>
+        <configuration>
+          <grammars>openldap.g</grammars>
+        </configuration>
+        <executions>
+           <execution>
+              <goals>
+                 <goal>generate</goal>
+              </goals>
+           </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/Abstract*</exclude>
+            <exclude>**/*Test.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
+

Modified: directory/trunk/apacheds-plugin/project.properties
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-plugin/project.properties?rev=359946&r1=359915&r2=359946&view=diff
==============================================================================
--- directory/trunk/apacheds-plugin/project.properties (original)
+++ directory/trunk/apacheds-plugin/project.properties Thu Dec 29 16:25:47 2005
@@ -1,26 +1,3 @@
-# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
-# 
-# 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.
-# -------------------------------------------------------------------
-
-maven.xdoc.date=left
-## maven.xdoc.version=${pom.currentVersion}
-
-# antlr configuration
-maven.antlr.grammars=openldap.g
-maven.antlr.src.dir=${basedir}/src/main/antlr
-
 # schema configuration
 maven.ldap.server.schema.dir=src/main/schema
 maven.ldap.server.schemas=core,java,inetorgperson
@@ -33,10 +10,4 @@
 maven.ldap.server.schema.package.java=org.apache.ldap.server.schema.optional
 
 maven.ldap.server.schema.deps.inetorgperson=system,core
-
-maven.multiproject.type=plugin
-maven.xdoc.includeProjectDocumentation=yes
-maven.license.licenseFile=${basedir}/../LICENSE.txt
-
-maven.eclipse.classpath.include=${basedir}/target/antlr
 

Added: directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java?rev=359946&view=auto
==============================================================================
--- directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
(added)
+++ directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
Thu Dec 29 16:25:47 2005
@@ -0,0 +1,54 @@
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   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.
+ *
+ */
+package org.apache.ldap.server.tools.schema;
+
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+
+/**
+ * Maven 2 plugin mojo wrapper for directory plugin.
+ * 
+ * @goal sayhi
+ * @description Says "Hi" to the user
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class DirectorySchemaToolMojo extends AbstractMojo
+{
+    /**
+     * The directory containing the OpenLDAP schema files.
+     */
+    private File schemaSourcesDir;
+    
+
+    public void execute() throws MojoExecutionException 
+    {
+        try
+        {
+            getLog().info( "schemaSourcesDir = " + schemaSourcesDir.getCanonicalPath() );
+        }
+        catch ( IOException e )
+        {
+            e.printStackTrace();
+        }
+    }
+}

Propchange: directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunk/apacheds-shared/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 29 16:25:47 2005
@@ -1,4 +1,7 @@
 target
+.deployables
+.wtpmodules
+.settings
 *.log
 *.project
 *.classpath

Modified: directory/trunk/todo.txt
URL: http://svn.apache.org/viewcvs/directory/trunk/todo.txt?rev=359946&r1=359945&r2=359946&view=diff
==============================================================================
--- directory/trunk/todo.txt (original)
+++ directory/trunk/todo.txt Thu Dec 29 16:25:47 2005
@@ -2,3 +2,5 @@
    things that depend on jdk 1.5 when building with jdk 1.4.
  o figure out what we're going to do with sitedocs and how we're going to
    build and deploy them
+ o need to designate deps as transitive verses test for most
+   projects



Mime
View raw message