geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r597141 - in /geronimo/sandbox/jetspeed-integration: ./ jetspeed-base/ jetspeed-database/ jetspeed-database/src/main/java/ jetspeed-derby-database/ jetspeed-geronimo/ jetspeed-geronimo/src/ jetspeed-geronimo/src/main/ jetspeed-geronimo/src/...
Date Wed, 21 Nov 2007 16:49:05 GMT
Author: prasad
Date: Wed Nov 21 08:49:02 2007
New Revision: 597141

URL: http://svn.apache.org/viewvc?rev=597141&view=rev
Log:
* split jetspeed-geronimo out of jetspeed-database

Added:
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt   (with props)
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt   (with props)
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml   (with props)
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
  (with props)
Removed:
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/
Modified:
    geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml
    geronimo/sandbox/jetspeed-integration/pom.xml

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml?rev=597141&r1=597140&r2=597141&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml Wed Nov 21 08:49:02 2007
@@ -68,8 +68,12 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-         
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>jetspeed-database</artifactId>
+            <version>${version}</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml?rev=597141&r1=597140&r2=597141&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml Wed Nov 21 08:49:02 2007
@@ -40,110 +40,6 @@
        <jetspeedVersion>2.1.3-dev</jetspeedVersion>
      </properties>
 
-     <dependencies>
-       <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-       <dependency>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-api</artifactId>
-            <version>${jetspeedVersion}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-commons</artifactId>
-            <version>${jetspeedVersion}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>portals-bridges-common</artifactId>
-            <version>1.0.3</version>
-            <type>jar</type>
-        </dependency>
-
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-cm</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-rdbms</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-capability</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-security</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-serializer</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-profiler</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-registry</artifactId>
-            <version>${jetspeedVersion}</version>
-            <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-portal</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-portal-site</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>org.apache.portals.jetspeed-2</groupId>
-             <artifactId>jetspeed-page-manager</artifactId>
-             <version>${jetspeedVersion}</version>
-             <type>jar</type>
-         </dependency>
-        <dependency>
-             <groupId>tyrex</groupId>
-             <artifactId>tyrex</artifactId>
-             <version>1.0.1</version>
-             <type>jar</type>
-         </dependency>
-
-     </dependencies>
-    
     <build>
         <resources>
             <resource>
@@ -154,13 +50,4 @@
         </resources>
     </build>
 
-    <repositories>
-        <repository>
-            <id>com.bluesunrise.m1</id>
-            <name>Maven1 BlueSunrise</name>
-            <url>http://www.bluesunrise.com/maven</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-        
 </project>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/pom.xml?rev=597141&r1=597140&r2=597141&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/pom.xml Wed Nov 21 08:49:02
2007
@@ -30,12 +30,6 @@
        This is the configuration of the derby datasource for the Jetspeed portal
     </description>
     <dependencies>
-      <dependency>
-          <groupId>org.apache.geronimo.modules</groupId>
-          <artifactId>jetspeed-database</artifactId>
-          <version>${version}</version>
-          <type>jar</type>
-      </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetspeed-base</artifactId>

Added: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt?rev=597141&view=auto
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt (added)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt Wed Nov 21 08:49:02
2007
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt?rev=597141&view=auto
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt (added)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt Wed Nov 21 08:49:02
2007
@@ -0,0 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml?rev=597141&view=auto
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml (added)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml Wed Nov 21 08:49:02 2007
@@ -0,0 +1,154 @@
+<?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
+
+    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>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jetspeed-geronimo</artifactId>
+    <name>Geronimo Modules :: Jetspeed Geronimo GBeans</name>
+    <packaging>jar</packaging>
+
+     <description>
+       This module carries GBeans for Jetspeed. 
+     </description> 
+
+     <properties>
+       <jetspeedVersion>2.1.3-dev</jetspeedVersion>
+     </properties>
+
+     <dependencies>
+       <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-api</artifactId>
+            <version>${jetspeedVersion}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-commons</artifactId>
+            <version>${jetspeedVersion}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+            <version>1.0.1</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>1.0.3</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-cm</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-rdbms</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-capability</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-security</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-serializer</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-profiler</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-registry</artifactId>
+            <version>${jetspeedVersion}</version>
+            <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-portal</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-portal-site</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-page-manager</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>tyrex</groupId>
+             <artifactId>tyrex</artifactId>
+             <version>1.0.1</version>
+             <type>jar</type>
+         </dependency>
+     </dependencies>
+    
+    <repositories>
+        <repository>
+            <id>com.bluesunrise.m1</id>
+            <name>Maven1 BlueSunrise</name>
+            <url>http://www.bluesunrise.com/maven</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+        
+</project>

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java?rev=597141&view=auto
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
(added)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
Wed Nov 21 08:49:02 2007
@@ -0,0 +1,177 @@
+/*
+ * 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.
+ */
+package org.apache.geronimo.jetspeed.integration;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import java.net.URL;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import org.apache.jetspeed.components.jndi.SpringJNDIStarter;
+import org.apache.jetspeed.serializer.JetspeedSerializer;
+import org.apache.jetspeed.serializer.JetspeedSerializerImpl;
+
+import org.apache.geronimo.kernel.util.ClassLoaderDumper;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+/**
+ * Jetspeed Serializer  GBean
+ * 
+ * @version $Id: $
+ */
+public class JetspeedSerializerGBean {
+
+    public JetspeedSerializerGBean(String driverClass, String url, String user, String password,
String logLevel, ClassLoader classLoader) throws Exception {
+
+        if ( driverClass == null )
+            driverClass = "org.apache.derby.jdbc.EmbeddedDriver";
+        if ( url == null )
+            url = "jdbc:derby:JetspeedDB";
+        if ( user == null )
+            user = "";
+        if ( password == null )
+            password = "";
+        if ( logLevel == null )
+            logLevel = "ERROR";
+
+
+
+        JetspeedSerializer serializer = null;
+
+        String applicationPath = getAppRoot(classLoader);
+        String configFiles = new File(applicationPath, "assembly").getAbsolutePath();
+        String bootConfigFiles = new File(configFiles, "boot").getAbsolutePath();
+
+        configFiles = "file:/" + configFiles + File.separator + "*.xml";
+        System.out.println(configFiles);
+        bootConfigFiles = "file:/" + bootConfigFiles + File.separator + "*.xml";
+        System.out.println(bootConfigFiles);
+
+        HashMap context = new HashMap();
+        context.put(SpringJNDIStarter.DATASOURCE_DRIVER, driverClass);
+        context.put(SpringJNDIStarter.DATASOURCE_URL, url);
+        context.put(SpringJNDIStarter.DATASOURCE_USERNAME, user);
+        context.put(SpringJNDIStarter.DATASOURCE_PASSWORD, password);
+
+        Logger  logger = Logger.getLogger("org.springframework");
+        Level level = logger.getLevel();
+        if ( logLevel.equalsIgnoreCase("INFO") )
+            logger.setLevel(Level.INFO);
+        else
+            if ( logLevel.equalsIgnoreCase("WARN") )
+            logger.setLevel(Level.WARN);
+        else
+            logger.setLevel(Level.ERROR);
+
+/**
+ * set the application root
+ */
+        System.out.println("APP ROOT is " + applicationPath);
+        System.setProperty("applicationRoot",applicationPath);
+        System.setProperty("portal.name","jetspeed");
+        SpringJNDIStarter starter = new SpringJNDIStarter(context, applicationPath, new String[]{bootConfigFiles},
new String[]{configFiles});
+
+        System.out.println("starter framework created " + starter);
+
+
+        try {
+            starter.setUp();
+        }
+        catch ( Exception e ) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+        System.out.println("starter framework established " + starter);
+        String[] importList = null;
+
+        Map settings = new HashMap();
+        settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING, Boolean.TRUE);
+
+        String fileName = new File(applicationPath + "/j2-seed.xml").getAbsolutePath();
+        try {
+            System.out.println("processing import  " + fileName );
+            serializer = new JetspeedSerializerImpl(starter.getComponentManager());
+            serializer.importData(fileName, settings);
+            System.out.println("processing import  " + fileName  + " done");
+        }
+        catch ( Exception e ) {
+            System.err.println("Failed to process XML import for " + fileName + ":" + e);
+            e.printStackTrace();
+        }
+        finally {
+            if ( serializer != null )
+                serializer.closeUp();
+        }
+
+        try {
+            starter.tearDown();
+            logger.setLevel(level);;
+        }
+        catch ( Exception e1 ) {
+            System.out.println("starter framework teardown caused exception "  + e1.getLocalizedMessage());
+            e1.printStackTrace();
+
+        }
+    }
+
+    private String getAppRoot(ClassLoader classLoader) {
+        URL url = classLoader.getResource("org/apache/jetspeed/components/jndi/SpringJNDIStarter.class");
+        if (url == null) {
+            System.out.println("SpringJNDIStarter.class is not in classpath");
+            return null;
+        }
+
+        System.out.println("getFile " + url.getFile());
+        String path = url.getFile();
+        int index = path.lastIndexOf("!");
+        path = path.substring(0, index);
+        System.out.println(path);
+        path = path.substring(path.indexOf("/") + 1);
+        System.out.println(path);
+        path = new File(path).getParentFile().getParent();
+        System.out.println(path);
+        return path;
+    }
+
+
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JetspeedSerializerGBean.class,
"GBean");
+        infoBuilder.addAttribute("driverClass", String.class, true);
+        infoBuilder.addAttribute("url", String.class, true);
+        infoBuilder.addAttribute("user", String.class, true);
+        infoBuilder.addAttribute("password", String.class, true);
+        infoBuilder.addAttribute("logLevel", String.class, true);
+        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+
+        infoBuilder.setConstructor(new String[]{"driverClass", "url", "user", "password",
"logLevel", "classLoader"});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml?rev=597141&r1=597140&r2=597141&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml Wed Nov 21 08:49:02 2007
@@ -57,10 +57,9 @@
             <version>${jetspeedVersion}</version>
             <type>war</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>jetspeed-database</artifactId>
+            <artifactId>jetspeed-geronimo</artifactId>
             <version>${version}</version>
             <type>jar</type>
         </dependency>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml?rev=597141&r1=597140&r2=597141&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml Wed Nov 21
08:49:02 2007
@@ -31,6 +31,8 @@
         </role-mappings>
     </security>
 
-    <gbean name="PopulateDB" class="org.apache.geronimo.jetspeed.integration.JetspeedSerializerGBean"
/>
+    <gbean name="PopulateDB" class="org.apache.geronimo.jetspeed.integration.JetspeedSerializerGBean">
+      <attribute name="logLevel">INFO</attribute>
+    </gbean>
 
 </web-app>

Modified: geronimo/sandbox/jetspeed-integration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/pom.xml?rev=597141&r1=597140&r2=597141&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/pom.xml Wed Nov 21 08:49:02 2007
@@ -28,6 +28,7 @@
     </description>
     
     <modules>
+      <module>jetspeed-geronimo</module>
       <module>jetspeed-database</module>
       <module>jetspeed-base</module>
       <module>jetspeed-derby-database</module>



Mime
View raw message