directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r642493 - in /directory/sandbox/akarasulu/bigbang/daemon: ./ bootstrappers/ plugin/ plugin/src/main/java/org/apache/directory/daemon/installers/ plugin/src/main/java/org/apache/directory/daemon/installers/rpm/ plugin/src/site/
Date Sat, 29 Mar 2008 02:52:47 GMT
Author: akarasulu
Date: Fri Mar 28 19:52:46 2008
New Revision: 642493

URL: http://svn.apache.org/viewvc?rev=642493&view=rev
Log:
[MERGE][638212:642492] pulling in changes from bigbang since last merge

Modified:
    directory/sandbox/akarasulu/bigbang/daemon/   (props changed)
    directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
    directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
    directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/site.xml
    directory/sandbox/akarasulu/bigbang/daemon/pom.xml

Propchange: directory/sandbox/akarasulu/bigbang/daemon/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 28 19:52:46 2008
@@ -2,3 +2,4 @@
 workspace
 *.iml
 .project
+.classpath

Modified: directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE Fri Mar 28 19:52:46 2008
@@ -14,3 +14,6 @@
 svn merge -r 613581:638212 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang
.
 Committed revision 638214.
 
+Fri Mar 28 22:56:07 EDT 2008
+----------------------------
+svn merge -r 638212:642492 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang
.

Modified: directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml Fri Mar 28 19:52:46 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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
+<?xml version="1.0" encoding="UTF-8"?>
 
-    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.
+<!--
+  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.
 -->
-<!-- $Rev:  $ $Date:  $ -->
+
 <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>

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml Fri Mar 28 19:52:46 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+  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.
 -->
-<!-- $Rev:  $ $Date:  $ -->
+
 <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>
@@ -72,4 +75,12 @@
     </dependency>
   </dependencies>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
(original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
Fri Mar 28 19:52:46 2008
@@ -49,8 +49,8 @@
         this.target = target;
         initializeFiltering();
     }
-    
-    
+
+
     public Properties getFilterProperties()
     {
         return filterProperties;
@@ -118,8 +118,8 @@
         {
             try
             {
-                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties,
-                    getClass().getResourceAsStream( "LICENSE" ), licenseTarget, false );
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream(
"LICENSE" ),
+                    licenseTarget, false );
             }
             catch ( IOException e )
             {
@@ -167,17 +167,17 @@
         }
 
         // copy over the REQUIRED logger artifact
-/*
-        try
-        {
-            FileUtils.copyFile( mymojo.getLogger().getFile(), layout.getLogger() );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoFailureException( "Failed to copy logger.jar " + mymojo.getLogger().getFile()
-                + " into position " + layout.getLogger() );
-        }
-*/
+        /*
+                try
+                {
+                    FileUtils.copyFile( mymojo.getLogger().getFile(), layout.getLogger()
);
+                }
+                catch ( IOException e )
+                {
+                    throw new MojoFailureException( "Failed to copy logger.jar " + mymojo.getLogger().getFile()
+                        + " into position " + layout.getLogger() );
+                }
+        */
 
         // copy over the REQUIRED daemon.jar file 
         try
@@ -216,7 +216,7 @@
             catch ( IOException e )
             {
                 log.error( "Failed to copy logger configuration file " + target.getLoggerConfigurationFile()
-                        + " into position " + layout.getLoggerConfigurationFile(), e );
+                    + " into position " + layout.getLoggerConfigurationFile(), e );
             }
         }
 
@@ -230,7 +230,7 @@
             catch ( IOException e )
             {
                 log.error( "Failed to copy server configuration file " + target.getServerConfigurationFile()
-                        + " into position " + layout.getConfigurationFile(), e );
+                    + " into position " + layout.getConfigurationFile(), e );
             }
         }
 
@@ -238,78 +238,151 @@
         // Copy Wrapper Files
         // -------------------------------------------------------------------
 
-        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "i386"
) && target.getDaemonFramework().equals("tanuki"))
-        {
-            try
-            {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/bin/wrapper-linux-x86-32"
),
-                        new File( layout.getBinDirectory(), target.getApplication().getName()
) );
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/libwrapper-linux-x86-32.so"
),
-                        new File( layout.getLibDirectory(), "libwrapper.so" ) );
-            }
-            catch ( IOException e )
-            {
-                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib
and bin directories");
-            }
-        }
-
-
-        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64"
) && target.getDaemonFramework().equals("tanuki"))
-        {
-            try
-            {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/bin/wrapper-linux-x86-64"
),
-                        new File( layout.getBinDirectory(), target.getApplication().getName()
) );
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/libwrapper-linux-x86-64.so"
),
-                        new File( layout.getLibDirectory(), "libwrapper.so" ) );
-            }
-            catch ( IOException e )
-            {
-                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib
and bin directories");
+        // TODO I really wonder if wrapper bin, lib for macosx and solaris don't need to
be
+        // copied in case if os?
+        if ( target.getDaemonFramework().equalsIgnoreCase( "tanuki" ) )
+        {
+            if ( target.getOsName().equalsIgnoreCase( "linux" ) )
+            {
+                if ( target.getOsArch().equals( "i386" ) )
+                {
+                    try
+                    {
+                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                            "wrapper/bin/wrapper-linux-x86-32" ), new File( layout.getBinDirectory(),
target
+                            .getApplication().getName() ) );
+                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                            "wrapper/lib/libwrapper-linux-x86-32.so" ), new File( layout.getLibDirectory(),
+                            "libwrapper.so" ) );
+                    }
+                    catch ( IOException e )
+                    {
+                        throw new MojoFailureException( "Failed to copy Tanuki binary files
to lib and bin directories" );
+                    }
+                }
+                else
+                {
+                    if ( target.getOsArch().equals( "x86_64" ) )
+                    {
+                        try
+                        {
+                            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                                "wrapper/bin/wrapper-linux-x86-64" ), new File( layout.getBinDirectory(),
target
+                                .getApplication().getName() ) );
+                            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                                "wrapper/lib/libwrapper-linux-x86-64.so" ), new File( layout.getLibDirectory(),
+                                "libwrapper.so" ) );
+                        }
+                        catch ( IOException e )
+                        {
+                            throw new MojoFailureException(
+                                "Failed to copy Tanuki binary files to lib and bin directories"
);
+                        }
+                    }
+                    else
+                    {
+                        throw new MojoFailureException( "OsName='linux' supports only OsArc='[i386|x86_64]'"
);
+                    }
+                }
+            }
+            else
+            {
+                if ( target.getOsFamily().equalsIgnoreCase( "windows" ) )
+                {
+                    try
+                    {
+                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                            "wrapper/bin/wrapper-windows-x86-32.exe" ), new File( layout.getBinDirectory(),
target
+                            .getApplication().getName() ) );
+                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                            "wrapper/lib/wrapper-windows-x86-32.dll" ), new File( layout.getLibDirectory(),
+                            "libwrapper.so" ) );
+                    }
+                    catch ( IOException e )
+                    {
+                        throw new MojoFailureException( "Failed to copy Tanuki binary files
to lib and bin directories" );
+                    }
+                }
+                else
+                {
+                    throw new MojoFailureException(
+                        "Not supported for configured daemon framework. OsName=" + target.getOsName()
+ " OsFamily=" + target.getOsFamily());
+                }
             }
         }
-
-        // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

-        if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "sparc"
) )
-        {
-            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
-            try
-            {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc"
), executable );
-            }
-            catch ( IOException e )
-            {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "
-                    + getClass().getResource( "jsvc_solaris_sparc" ) + " into position "
+ executable.getAbsolutePath() );
-            }
-        }
-
-        if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "i386"
) )
-        {
-            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
-            try
-            {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_i386"
), executable );
-            }
-            catch ( IOException e )
-            {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "
-                    + getClass().getResource( "jsvc_solaris_i386" ) + " into position " +
executable.getAbsolutePath() );
-            }
-        }
-
-        // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

-        if ( target.getOsName().equals( "macosx" ) && target.getOsArch().equals(
"ppc" ) )
+        else
         {
-            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
-            try
-            {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_macosx_ppc"
), executable );
-            }
-            catch ( IOException e )
+            // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

+            if ( target.getOsName().equalsIgnoreCase( "sunos" ) )
             {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "
-                    + getClass().getResource( "jsvc_macosx_ppc" ) + " into position " + executable.getAbsolutePath()
);
+                if ( target.getOsArch().equalsIgnoreCase( "sparc" ) )
+                {
+                    File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
+                    try
+                    {
+                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc"
),
+                            executable );
+                    }
+                    catch ( IOException e )
+                    {
+                        throw new MojoFailureException( "Failed to copy jsvc executable file
"
+                            + getClass().getResource( "jsvc_solaris_sparc" ) + " into position
"
+                            + executable.getAbsolutePath() );
+                    }
+                }
+                else
+                {
+                    if ( target.getOsArch().equals( "i386" ) )
+                    {
+                        File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
+                        try
+                        {
+                            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
"jsvc_solaris_i386" ),
+                                executable );
+                        }
+                        catch ( IOException e )
+                        {
+                            throw new MojoFailureException( "Failed to copy jsvc executable
file "
+                                + getClass().getResource( "jsvc_solaris_i386" ) + " into
position "
+                                + executable.getAbsolutePath() );
+                        }
+                    }
+                    else
+                    {
+                        throw new MojoFailureException( "OsName='sunos' supports only OsArc='[sparc|i386]'"
);
+                    }
+                }
+            }
+            else
+            {
+                // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()
+                if ( target.getOsName().equalsIgnoreCase( "macosx" ) )
+                {
+                    if ( target.getOsArch().equalsIgnoreCase( "ppc" ) )
+                    {
+                        File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
+                        try
+                        {
+                            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
"jsvc_macosx_ppc" ),
+                                executable );
+                        }
+                        catch ( IOException e )
+                        {
+                            throw new MojoFailureException( "Failed to copy jsvc executable
file "
+                                + getClass().getResource( "jsvc_macosx_ppc" ) + " into position
"
+                                + executable.getAbsolutePath() );
+                        }
+                    }
+                    else
+                    {
+                        throw new MojoFailureException( "OsName='macosx' supports only OsArch='[ppc]'"
);
+                    }
+                }
+                else
+                {
+                    throw new MojoFailureException( "OsName='" + target.getOsName()
+                        + "' is not supported for build process." );
+                }
             }
         }
 
@@ -360,10 +433,10 @@
             catch ( IOException e )
             {
                 log.error( "Failed to notice file " + noticeFile.getAbsolutePath() + " into
position "
-                        + noticeFileTarget.getAbsolutePath(), e );
+                    + noticeFileTarget.getAbsolutePath(), e );
             }
         }
-        
+
         processPackagedFiles( target, mymojo.getPackagedFiles() );
     }
 }

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
(original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Fri Mar 28 19:52:46 2008
@@ -112,7 +112,7 @@
 
         if ( target.getRpmTopDir() == null )
         {
-            target.setRpmTopDir( new File( System.getProperty( "user.home" ) + "/rpmbuild"
) );
+            target.setRpmTopDir( new File( "target/rpmbuild" ) );
         }
 
         if ( !target.getRpmTopDir().exists() )
@@ -233,8 +233,8 @@
         String[] cmd = new String[]
             { rpmBuilder.getAbsolutePath(), "-ba", "--define", "_topdir " + target.getRpmTopDir().getAbsolutePath(),
rpmConfigurationFile.getAbsolutePath() };
         MojoHelperUtils.exec( cmd, target.getLayout().getBaseDirectory().getParentFile(),
target.isDoSudo() );
-        String rpmName = target.getApplication().getName() + "-" + version + "-0.i386.rpm";
-        File srcFile = new File( System.getProperty("user.home") + "/rpmbuild/RPMS/i386",
rpmName );
+        String rpmName = target.getApplication().getName() + "-" + version + "-0." + target.getOsArch()
+ ".rpm";
+        File srcFile = new File( target.getRpmTopDir(), "RPMS/" + target.getOsArch() + "/"
+ rpmName );
         File dstFile = null;
 
         if ( target.getFinalName() == null )
@@ -630,7 +630,7 @@
 
         String[] cmd = new String[]
             { "tar", "-zcvf",
-                System.getProperty("user.home") + "/rpmbuild/SOURCES/" + target.getApplication().getName()
+ "-" + version + ".tar.gz",
+            target.getRpmTopDir().getAbsolutePath() + "/SOURCES/" + target.getApplication().getName()
+ "-" + version + ".tar.gz",
                 sourcesDir.getAbsolutePath() };
 
         MojoHelperUtils.exec( cmd, target.getLayout().getBaseDirectory().getParentFile(),
target.isDoSudo() );

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/site.xml?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/site.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/site/site.xml Fri Mar 28 19:52:46
2008
@@ -19,14 +19,17 @@
   @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
 -->
 <project name="${project.name}">
-    <bannerLeft>
-        <name>${project.name}</name>
-    </bannerLeft>
-    <publishDate position="navigation-bottom" format="dd-MM-yyyy HH:mm" />
-    <body>
-        <menu name="Parent">
-            <item name="Apache Directory Daemon" href="../index.html" />
-        </menu>
-        <menu ref="reports" />
-    </body>
+  <bannerLeft>
+    <name>${project.name}</name>
+  </bannerLeft>
+  <publishDate position="navigation-bottom" format="dd-MM-yyyy HH:mm" />
+  <body>
+    <menu name="Parent">
+      <item name="Apache Directory Daemon" href="../index.html" />
+    </menu>
+    <menu name="Overview">
+      <item name="Goals" href="plugin-info.html" />
+    </menu>
+    <menu ref="reports" />
+  </body>
 </project>

Modified: directory/sandbox/akarasulu/bigbang/daemon/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/pom.xml?rev=642493&r1=642492&r2=642493&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/pom.xml Fri Mar 28 19:52:46 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+  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.
 -->
-<!-- $Rev:  $ $Date:  $ -->
+
 <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>
@@ -37,6 +40,11 @@
     plugin allow for the rapid creation of standalone daemon applications.
   </description>
 
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.apache.org/jira/browse/DIR</url>
+  </issueManagement>
+
   <modules>
     <module>bootstrappers</module>
     <module>plugin</module>
@@ -127,9 +135,8 @@
 
   <distributionManagement>
     <site>
-      <id>apache.directory.studio</id>
-      <!-- FIXME set final url according to CI -->
-      <url>scpexe://people.apache.org/home/felixk/public_html/projects/directory/daemon/</url>
+      <id>apache.directory.daemon</id>
+      <url>scpexe://vm094.oxylos.org/var/www/html/projects/daemon/</url>
     </site>
   </distributionManagement>
 
@@ -138,28 +145,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-	      <!--
-              <report>project-team</report>
-              <report>mailing-list</report>
-              <report>issue-tracking</report>
-              <report>license</report>
-              <report>scm</report>
-	      -->
-              <report>license</report>
-              <report>dependencies</report>
-              <report>issue-tracking</report>
-              <report>index</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <aggregate>true</aggregate>
@@ -278,5 +263,17 @@
       </build>
     </profile>
   </profiles>
+
+  <repositories>
+    <repository>
+      <id>apache.directory.snapshot.repo</id>
+      <name>Snapshot repository for the Apache Directory project</name>
+      <url>http://vm094.oxylos.org/mirror-maven2/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  
 </project>
 



Mime
View raw message