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 2006/10/24 23:09:11 UTC
svn commit: r467484 [2/2] - in /geronimo/sandbox/javaee5:
assemblies-jee5/geronimo-jetty6-jee5/
assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/ configs-jee5/
configs-jee5/jetty6-deployer/src/plan/
configs-jee5/persistence-jpa10-deployer/ conf...
Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml?view=auto&rev=467484
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml Tue Oct 24 14:09:09 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $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-jee5</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-persistence-jpa10-builder</artifactId>
+ <name>Geronimo :: Persistence JPA1.0 :: Builder</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-persistence-jpa10</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ </build>
+
+</project>
+
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?view=auto&rev=467484
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Tue Oct 24 14:09:09 2006
@@ -0,0 +1,195 @@
+/*
+ * 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.persistence.builder;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.deployment.xbeans.ServiceDocument;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
+import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.persistence.PersistenceUnitGBean;
+import org.apache.geronimo.xbeans.persistence.PersistenceDocument;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.QNameSet;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class PersistenceUnitBuilder implements NamespaceDrivenBuilder {
+ private static final QName PERSISTENCE_QNAME = PersistenceDocument.type.getDocumentElementName();
+
+ private final Environment defaultEnvironment;
+ private final String defaultPersistenceProviderClassName;
+
+ public PersistenceUnitBuilder(Environment defaultEnvironment, String defaultPersistenceProviderClassName) {
+ this.defaultEnvironment = defaultEnvironment;
+ this.defaultPersistenceProviderClassName = defaultPersistenceProviderClassName;
+ }
+
+ public void buildEnvironment(XmlObject container, Environment environment) throws DeploymentException {
+ XmlObject[] raws = container.selectChildren(PERSISTENCE_QNAME);
+ if (raws.length > 0) {
+ EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+ }
+ }
+
+ public void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException {
+ XmlObject[] raws = container.selectChildren(PERSISTENCE_QNAME);
+ for (XmlObject raw : raws) {
+ PersistenceDocument.Persistence persistence = (PersistenceDocument.Persistence) raw.copy().changeType(PersistenceDocument.Persistence.type);
+ PersistenceDocument.Persistence.PersistenceUnit[] persistenceUnits = persistence.getPersistenceUnitArray();
+ for (PersistenceDocument.Persistence.PersistenceUnit persistenceUnit : persistenceUnits) {
+ String persistenceUnitName = persistenceUnit.getName().trim();
+ GBeanData gbeanData;
+ try {
+ gbeanData = moduleContext.addGBean(persistenceUnitName, PersistenceUnitGBean.GBEAN_INFO);
+ } catch (GBeanAlreadyExistsException e) {
+ throw new DeploymentException("Duplicate persistenceUnit name " + persistenceUnitName, e);
+ }
+ gbeanData.setAttribute("persistenceUnitName", persistenceUnitName);
+ if (persistenceUnit.isSetProvider()) {
+ gbeanData.setAttribute("persistenceProviderClassName", persistenceUnit.getProvider().trim());
+ } else {
+ gbeanData.setAttribute("persistenceProviderClassName", defaultPersistenceProviderClassName);
+ }
+ gbeanData.setAttribute("persistenceUnitTransactionType", persistenceUnit.getTransactionType().toString());
+ if (persistenceUnit.isSetJtaDataSource()) {
+ String jtaDataSourceString = persistenceUnit.getJtaDataSource().trim();
+ try {
+ AbstractNameQuery jtaDataSourceNameQuery = new AbstractNameQuery(new URI(jtaDataSourceString + "#org.apache.geronimo.connector.outbound.ConnectionFactorySource"));
+ gbeanData.setReferencePattern("JtaDataSourceWrapper", jtaDataSourceNameQuery);
+ } catch (URISyntaxException e) {
+ throw new DeploymentException("Could not create jta-data-source AbstractNameQuery from string: " + jtaDataSourceString, e);
+ }
+ }
+
+ if (persistenceUnit.isSetNonJtaDataSource()) {
+ String nonJtaDataSourceString = persistenceUnit.getNonJtaDataSource().trim();
+ try {
+ AbstractNameQuery nonJtaDataSourceNameQuery = new AbstractNameQuery(new URI(nonJtaDataSourceString + "#org.apache.geronimo.connector.outbound.ConnectionFactorySource"));
+ gbeanData.setReferencePattern("NonJtaDataSourceWrapper", nonJtaDataSourceNameQuery);
+ } catch (URISyntaxException e) {
+ throw new DeploymentException("Could not create non-jta-data-source AbstractNameQuery from string: " + nonJtaDataSourceString, e);
+ }
+ }
+
+ List<String> mappingFileNames = new ArrayList<String>();
+ String[] mappingFileNameStrings = persistenceUnit.getMappingFileArray();
+ for (String mappingFileNameString : mappingFileNameStrings) {
+ mappingFileNames.add(mappingFileNameString.trim());
+ }
+ gbeanData.setAttribute("mappingFileNames", mappingFileNames);
+
+ List<URL> jarFileUrls = new ArrayList<URL>();
+ String[] jarFileUrlStrings = persistenceUnit.getJarFileArray();
+ for (String jarFileUrlString1 : jarFileUrlStrings) {
+ String jarFileUrlString = jarFileUrlString1.trim();
+ try {
+ URL jarFileUrl = new URL(jarFileUrlString);
+ jarFileUrls.add(jarFileUrl);
+ } catch (MalformedURLException e) {
+ throw new DeploymentException("could not create URL for jarFileURL", e);
+ }
+ }
+ gbeanData.setAttribute("jarFileUrls", jarFileUrls);
+ //TODO what is this from??
+// URL persistenceUnitRootUrl = new URL(persistenceUnit.get)
+// gbeanData.setAttribute("persistenceUnitRootUrl", persistenceUnitRootUrl);
+
+ String[] managedClassNameStrings = persistenceUnit.getClass1Array();
+ List<String> managedClassNames = new ArrayList<String>();
+ for (String managedClassNameString : managedClassNameStrings) {
+ managedClassNames.add(managedClassNameString.trim());
+ }
+ gbeanData.setAttribute("managedClassNames", managedClassNames);
+ if (persistenceUnit.isSetExcludeUnlistedClasses()) {
+ gbeanData.setAttribute("excludeUnlistedClassesValue", persistenceUnit.getExcludeUnlistedClasses());
+ } else {
+ gbeanData.setAttribute("excludeUnlistedClassesValue", false);
+ }
+
+ Properties properties = new Properties();
+ if (persistenceUnit.isSetProperties()) {
+ PersistenceDocument.Persistence.PersistenceUnit.Properties.Property[] propertyObjects = persistenceUnit.getProperties().getPropertyArray();
+ for (PersistenceDocument.Persistence.PersistenceUnit.Properties.Property propertyObject : propertyObjects)
+ {
+ String key = propertyObject.getName().trim();
+ String value = propertyObject.getValue().trim();
+ properties.setProperty(key, value);
+ }
+ }
+
+ gbeanData.setAttribute("properties", properties);
+ if (moduleContext instanceof EARContext) {
+ AbstractNameQuery transactionManagerName = ((EARContext) moduleContext).getTransactionManagerName();
+ gbeanData.setReferencePattern("TransactionManager", transactionManagerName);
+ }
+ }
+ }
+ }
+
+ public String getNamespace() {
+ XmlBeansUtil.registerSubstitutionGroupElements(ServiceDocument.type.getDocumentElementName(), QNameSet.singleton(PERSISTENCE_QNAME));
+ return PERSISTENCE_QNAME.getNamespaceURI();
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(PersistenceUnitBuilder.class, NameFactory.MODULE_BUILDER);
+
+ infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+ infoBuilder.addAttribute("defaultPersistenceProviderClassName", String.class, true, true);
+
+ infoBuilder.setConstructor(new String[]{
+ "defaultEnvironment",
+ "defaultPersistenceProviderClassName"
+ });
+
+ GBEAN_INFO = infoBuilder.getBeanInfo();
+
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+
+
+}
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?view=diff&rev=467484&r1=467483&r2=467484
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Tue Oct 24 14:09:09 2006
@@ -88,7 +88,6 @@
try {
Class clazz = classLoader.loadClass(persistenceProviderClassName);
PersistenceProvider persistenceProvider = (PersistenceProvider) clazz.newInstance();
- //TODO need another set of properties here
entityManagerFactory = persistenceProvider.createContainerEntityManagerFactory(persistenceUnitInfo, properties);
} catch (ClassNotFoundException e) {
throw new PersistenceException("Could not locate PersistenceProvider class: " + persistenceProviderClassName + " in classloader " + classLoader, e);
Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt?view=auto&rev=467484
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt Tue Oct 24 14:09:09 2006
@@ -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/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt?view=auto&rev=467484
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt Tue Oct 24 14:09:09 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/javaee5/modules-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/pom.xml?view=diff&rev=467484&r1=467483&r2=467484
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/pom.xml Tue Oct 24 14:09:09 2006
@@ -47,6 +47,7 @@
<modules>
<module>geronimo-transaction-jta11</module>
<module>geronimo-persistence-jpa10</module>
+ <module>geronimo-persistence-jpa10-builder</module>
<module>geronimo-jetty6</module>
<module>geronimo-jetty6-clustering-wadi</module>
<module>geronimo-web-2.5-builder</module>