You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/11 07:56:37 UTC

svn commit: r635822 - in /geronimo/plugins/directory/branches/1.0: ./ directory/ directory/src/site/ directory/src/site/apt/ geronimo-directory-server/ geronimo-directory-server/src/ geronimo-directory-server/src/site/ geronimo-directory-server/src/sit...

Author: djencks
Date: Mon Mar 10 23:56:34 2008
New Revision: 635822

URL: http://svn.apache.org/viewvc?rev=635822&view=rev
Log:
Add a simple maven generated site.  For some reason the reports won't generate in geronimo-directory.... I can see them running but they aren't on the website

Added:
    geronimo/plugins/directory/branches/1.0/directory/src/site/
    geronimo/plugins/directory/branches/1.0/directory/src/site/apt/
    geronimo/plugins/directory/branches/1.0/directory/src/site/apt/index.apt
    geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml   (with props)
    geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/
    geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/
    geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/apt/
    geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/apt/index.apt
    geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml   (with props)
    geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/
    geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/apt/
    geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/apt/index.apt
    geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml   (with props)
    geronimo/plugins/directory/branches/1.0/src/
    geronimo/plugins/directory/branches/1.0/src/site/
    geronimo/plugins/directory/branches/1.0/src/site/apt/
    geronimo/plugins/directory/branches/1.0/src/site/apt/index.apt
    geronimo/plugins/directory/branches/1.0/src/site/site.xml   (with props)
Modified:
    geronimo/plugins/directory/branches/1.0/directory/pom.xml
    geronimo/plugins/directory/branches/1.0/geronimo-directory-server/pom.xml
    geronimo/plugins/directory/branches/1.0/geronimo-directory/pom.xml
    geronimo/plugins/directory/branches/1.0/pom.xml

Modified: geronimo/plugins/directory/branches/1.0/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/directory/pom.xml?rev=635822&r1=635821&r2=635822&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/directory/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/directory/pom.xml Mon Mar 10 23:56:34 2008
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>directory</artifactId>
-    <name>Geronimo Apache Directory Server Plugin</name>
+    <name>Apache Geronimo-Apache Directory Server Plugin</name>
     <packaging>car</packaging>
     <description>
         This plugin integrates the Apache Directory Server (ApacheDS)

Added: geronimo/plugins/directory/branches/1.0/directory/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/directory/src/site/apt/index.apt?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/directory/src/site/apt/index.apt (added)
+++ geronimo/plugins/directory/branches/1.0/directory/src/site/apt/index.apt Mon Mar 10 23:56:34 2008
@@ -0,0 +1,31 @@
+ -----
+ Geronimo-ApacheDS Plugin
+ -----
+ ------
+  $Rev: 508190 $ $Date: 2007-02-15 14:08:04 -0800 (Thu, 15 Feb 2007) $
+
+ ~~
+ ~~ 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.
+ ~~
+
+Directory Plugin
+
+ The Directory plugin installs apacheds 1.5.1 in its own classloader and starts and stops the server as the plugin starts and stops.
+The plugin supplies configuration of the providerURL which is needed to shut down the apacheds server.
+
+ The apacheDS server configuration is unpacked into var/directory/server.xml where it may be modified as necessary.
\ No newline at end of file

Added: geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml (added)
+++ geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml Mon Mar 10 23:56:34 2008
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+  <body>
+
+  </body>
+</project>

Propchange: geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/directory/branches/1.0/directory/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/plugins/directory/branches/1.0/geronimo-directory-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory-server/pom.xml?rev=635822&r1=635821&r2=635822&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory-server/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory-server/pom.xml Mon Mar 10 23:56:34 2008
@@ -27,7 +27,7 @@
   <groupId>org.apache.geronimo.assemblies</groupId>
   <artifactId>geronimo-directory-server</artifactId>
   <packaging>application-assembly</packaging>
-  <name>Sample Geronimo server running Apache Directory</name>
+  <name>Apache Geronimo Sample Server running Apache Directory</name>
   <description>Sample Geronimo server running Apache Directory.  Not suitable for distribution
   as it does not contain required legal files.</description>
   <build>

Added: geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/apt/index.apt?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/apt/index.apt (added)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/apt/index.apt Mon Mar 10 23:56:34 2008
@@ -0,0 +1,42 @@
+ -----
+ Geronimo-ApacheDS integration plugin, Sample Server
+ -----
+ ------
+  $Rev: 508190 $ $Date: 2007-02-15 14:08:04 -0800 (Thu, 15 Feb 2007) $
+
+ ~~
+ ~~ 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.
+ ~~
+
+Directory Sample Server
+
+ The directory sample server contains the directory plugin and the necessary plugin machinery for installing more plugins.
+It is useful primarily as a simple check that the directory plugin works.
+
+ This server is not currently suitable for release as it does not include required legal files.
+
+ After building you will find the server in your local maven repo or geronimo-directory-server/target. Unpack the server of your choice
+and start with
+
++---------+
+./bin/gsh geronimo/start-server
++---------+
+
+ You can connect with Apache Directory Studio on port 10389.
+
+

Added: geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml (added)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml Mon Mar 10 23:56:34 2008
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+  <body>
+  </body>
+</project>

Propchange: geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/directory/branches/1.0/geronimo-directory-server/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/plugins/directory/branches/1.0/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory/pom.xml?rev=635822&r1=635821&r2=635822&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory/pom.xml Mon Mar 10 23:56:34 2008
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>geronimo-directory</artifactId>
-    <name>Geronimo :: Directory Plugin</name>
+    <name>Apache Geronimo-Apache Directory Server integration code</name>
 
     <dependencies>
 

Added: geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/apt/index.apt?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/apt/index.apt (added)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/apt/index.apt Mon Mar 10 23:56:34 2008
@@ -0,0 +1,29 @@
+ -----
+ Geronimo-ApacheDS integration plugin, Directory GBean
+ -----
+ ------
+  $Rev: 508190 $ $Date: 2007-02-15 14:08:04 -0800 (Thu, 15 Feb 2007) $
+
+ ~~
+ ~~ 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.
+ ~~
+
+DirectoryGBean
+
+ The directory gbean starts and stops the apacheds server using a server.xml file normally located in var/directory/server.xml.
+This version of apacheds requires an extra parameter 'providerURL' that is needed only to find the server in order to shut it down.

Added: geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml (added)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml Mon Mar 10 23:56:34 2008
@@ -0,0 +1,51 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<!--
+<project>
+  <body>
+      <menu ref="reports" />
+
+  </body>
+</project>
+-->
+
+<project name="${project.name}">
+
+    <body>
+
+        ${parentProject}
+
+        ${modules}
+
+        <menu name="${project.name}">
+            <item name="Overview" href="index.html"/>
+            <item name="Usage" href="usage.html"/>
+        </menu>
+
+        ${reports}
+
+    </body>
+
+</project>
+
+
+

Propchange: geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/directory/branches/1.0/geronimo-directory/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/plugins/directory/branches/1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/pom.xml?rev=635822&r1=635821&r2=635822&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/pom.xml Mon Mar 10 23:56:34 2008
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.4</version>
+        <version>1.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>directory-parent</artifactId>
-    <name>Geronimo Apache Directory Server integration parent</name>
+    <name>Apache Geronimo-Apache Directory Server Integration Parent</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
@@ -64,6 +64,14 @@
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
     </properties>
 
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <distributionManagement>
+        <site>
+            <id>geronimo-website</id>
+            <url>${staging.siteURL}/${siteId}/${version}</url>
+        </site>
+    </distributionManagement>
+    
     <dependencyManagement>
         <dependencies>
             <!-- NOTA BENE: use the org.apache.geronimo.javamail/geronimo-javamail_1.4_mail uber jar

Added: geronimo/plugins/directory/branches/1.0/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/src/site/apt/index.apt?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/src/site/apt/index.apt (added)
+++ geronimo/plugins/directory/branches/1.0/src/site/apt/index.apt Mon Mar 10 23:56:34 2008
@@ -0,0 +1,40 @@
+ -----
+ Geronimo-ApacheDS integration plugin
+ -----
+ ------
+  $Rev: 508190 $ $Date: 2007-02-15 14:08:04 -0800 (Thu, 15 Feb 2007) $
+
+ ~~
+ ~~ 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.
+ ~~
+
+Overview
+
+ This version of the geronimo-apacheds integration works with Geronimo 2.1 and ApacheDS 1.5.1.
+
+ The components are a gbean to run the apacheds server, in geronimo-directory, a plugin to install
+apacheds in the directory module, and an optional sample server that contains the plugin and the
+plugin plugin to install more stuff.
+
+ To build the sample server, run
+
++-----+
+
+mvn clean install -Pwith-assembly,default
+
++-----+

Added: geronimo/plugins/directory/branches/1.0/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/src/site/site.xml?rev=635822&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/src/site/site.xml (added)
+++ geronimo/plugins/directory/branches/1.0/src/site/site.xml Mon Mar 10 23:56:34 2008
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <skin>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>geronimo-skin</artifactId>
+        <version>1.4</version>
+    </skin>
+
+    <publishDate format="dd MMM yyyy"/>
+
+    <bannerLeft>
+        <src>images/topleft_logo_437x64.gif</src>
+        <href>http://geronimo.apache.org</href>
+    </bannerLeft>
+
+  <body>
+
+      <menu ref="modules" />
+  </body>
+</project>

Propchange: geronimo/plugins/directory/branches/1.0/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/directory/branches/1.0/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/directory/branches/1.0/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml