Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r483483 - in /jackrabbit/trunk/jackrabbit-jca:
 applications/test/jaas.config deploy/weblogic/weblogic-ra.xml pom.xml
 src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java
 src/main/rar/repository.xml src/main/rar10/META-INF/ra.xml
Date: Thu, 07 Dec 2006 15:19:53 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
Message-Id: <20061207151954.67AA41A9846@eris.apache.org>

Author: jukka
Date: Thu Dec  7 07:19:51 2006
New Revision: 483483

URL: http://svn.apache.org/viewvc?view=rev&rev=483483
Log:
jackrabbit-jca: Fixed svn:eol-style settings

Modified:
    jackrabbit/trunk/jackrabbit-jca/applications/test/jaas.config   (props changed)
    jackrabbit/trunk/jackrabbit-jca/deploy/weblogic/weblogic-ra.xml   (props changed)
    jackrabbit/trunk/jackrabbit-jca/pom.xml   (contents, props changed)
    jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java   (contents, props changed)
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/repository.xml   (contents, props changed)
    jackrabbit/trunk/jackrabbit-jca/src/main/rar10/META-INF/ra.xml   (contents, props changed)

Propchange: jackrabbit/trunk/jackrabbit-jca/applications/test/jaas.config
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-jca/deploy/weblogic/weblogic-ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/pom.xml?view=diff&rev=483483&r1=483482&r2=483483
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/pom.xml Thu Dec  7 07:19:51 2006
@@ -1,90 +1,90 @@
-<?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.
-  -->
-
-<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>
-
-<!-- ====================================================================== -->
-<!-- P R O J E C T  D E S C R I P T I O N                                   -->
-<!-- ====================================================================== -->
-  <parent>
-    <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit</artifactId>
-    <version>1.2-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>jackrabbit-jca</artifactId>
-  <packaging>rar</packaging>
-  <name>Jackrabbit JCA Resource Adapter</name>
-  <!--
-    Keep the description on a single line. Otherwise Maven might generate
-    a corrupted MANIFEST.MF (see http://jira.codehaus.org/browse/MJAR-4)
-   -->
-  <description>A resource adapter for Jackrabbit as specified by JCA 1.0 and 1.5.</description>
-
-  <scm>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-jca
-    </connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-jca
-    </developerConnection>
-    <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca</url>
-  </scm>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-rar-plugin</artifactId>
-        <configuration>
-          <includeJar>true</includeJar>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>	  
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?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.
+  -->
+
+<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>
+
+<!-- ====================================================================== -->
+<!-- P R O J E C T  D E S C R I P T I O N                                   -->
+<!-- ====================================================================== -->
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit</artifactId>
+    <version>1.2-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>jackrabbit-jca</artifactId>
+  <packaging>rar</packaging>
+  <name>Jackrabbit JCA Resource Adapter</name>
+  <!--
+    Keep the description on a single line. Otherwise Maven might generate
+    a corrupted MANIFEST.MF (see http://jira.codehaus.org/browse/MJAR-4)
+   -->
+  <description>A resource adapter for Jackrabbit as specified by JCA 1.0 and 1.5.</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-jca
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-jca
+    </developerConnection>
+    <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-rar-plugin</artifactId>
+        <configuration>
+          <includeJar>true</includeJar>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>	  
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: jackrabbit/trunk/jackrabbit-jca/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java?view=diff&rev=483483&r1=483482&r2=483483
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java Thu Dec  7 07:19:51 2006
@@ -1,60 +1,60 @@
-/*
- * 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.jackrabbit.jca;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.xa.XAResource;
-
-
-/**
- * JCR ResourceAdapter.
- */
-public class JCAResourceAdapter implements ResourceAdapter {
-
-    private final XAResource[] xaResources = new XAResource[0];
-
-    /**
-     * Notify the RepositoryManager that the lifecycle is managed by
-     * the container
-     */
-    public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
-        JCARepositoryManager.getInstance().setAutoShutdown(false);
-    }
-
-    /**
-     * Shutdown jackrabbit repositories
-     */
-    public void stop() {
-        JCARepositoryManager.getInstance().shutdown();
-    }
-
-    public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws ResourceException {
-    }
-
-    public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-    }
-
-    public XAResource[] getXAResources(ActivationSpec[] as) throws ResourceException {
-        return xaResources;
-    }
-
-}
+/*
+ * 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.jackrabbit.jca;
+
+import javax.resource.ResourceException;
+import javax.resource.spi.ActivationSpec;
+import javax.resource.spi.BootstrapContext;
+import javax.resource.spi.ResourceAdapter;
+import javax.resource.spi.ResourceAdapterInternalException;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.transaction.xa.XAResource;
+
+
+/**
+ * JCR ResourceAdapter.
+ */
+public class JCAResourceAdapter implements ResourceAdapter {
+
+    private final XAResource[] xaResources = new XAResource[0];
+
+    /**
+     * Notify the RepositoryManager that the lifecycle is managed by
+     * the container
+     */
+    public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
+        JCARepositoryManager.getInstance().setAutoShutdown(false);
+    }
+
+    /**
+     * Shutdown jackrabbit repositories
+     */
+    public void stop() {
+        JCARepositoryManager.getInstance().shutdown();
+    }
+
+    public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws ResourceException {
+    }
+
+    public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
+    }
+
+    public XAResource[] getXAResources(ActivationSpec[] as) throws ResourceException {
+        return xaResources;
+    }
+
+}

Propchange: jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAResourceAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/rar/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/rar/repository.xml?view=diff&rev=483483&r1=483482&r2=483483
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/rar/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/rar/repository.xml Thu Dec  7 07:19:51 2006
@@ -1,240 +1,240 @@
-<?xml version="1.0"?>
-<!--
-   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.
-  -->
-<!DOCTYPE Repository [
-    <!--
-        the Repository element configures a repository instance;
-        individual workspaces of the repository are configured through
-        separate configuration files called workspace.xml which are
-        located in a subfolder of the workspaces root directory
-        (see Workspaces element).
-
-        it consists of
-
-            a FileSystem element (the virtual file system
-            used by the repository to persist global state such as
-            registered namespaces, custom node types, etc..
-
-            a Security element that specifies the name of the app-entry
-            in the JAAS config and the access manager
-
-            a Workspaces element that specifies to the location of
-            workspaces root directory and the name of default workspace
-
-            a Workspace element that is used as a workspace configuration
-            template; it is used to create the initial workspace if there's
-            no workspace yet and for creating additional workspaces through
-            the api
-
-            a Versioning element that is used for configuring
-            versioning-related settings
-
-            a SearchIndex element that is used for configuring Indexing-related
-            settings on the /jcr:system tree.
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
-
-    <!--
-        a virtual file system
-    -->
-    <!ELEMENT FileSystem (param*)>
-    <!ATTLIST FileSystem
-      class CDATA #REQUIRED>
-
-    <!--
-        the Security element specifies the name (appName attribute)
-        of the JAAS configuration app-entry for this repository. 
-
-        it also specifies the access manager to be used (AccessManager element).
-    -->
-    <!ELEMENT Security (AccessManager, LoginModule?)>
-    <!ATTLIST Security
-      appName CDATA #REQUIRED>
-
-    <!--
-        the AccessManager element configures the access manager to be used by
-        this repository instance; the class attribute specifies the FQN of the
-        class implementing the AccessManager interface
-    -->
-    <!ELEMENT AccessManager (param*)>
-    <!ATTLIST AccessManager
-      class CDATA #REQUIRED>
-
-    <!--
-        generic parameter (name/value pair)
-    -->
-    <!ELEMENT param EMPTY>
-    <!ATTLIST param
-      name CDATA #REQUIRED
-      value CDATA #REQUIRED>
-
-     <!--
-        the LoginModule element optionally specifies a JAAS login module to
-        authenticate users. This feature allows the use of Jackrabbit in a
-        non-JAAS environment.
-    -->
-    <!ELEMENT LoginModule (param*)>
-    <!ATTLIST LoginModule
-      class CDATA #REQUIRED>
-
-   <!--
-        the Workspaces element specifies the workspaces root directory
-        (rootPath attribute) and the name of the default workspace
-        (defaultWorkspace attribute).
-
-        individual workspaces are configured through individual workspace.xml
-        files located in a subfolder each of the workspaces root directory.
-    -->
-    <!ELEMENT Workspaces EMPTY>
-    <!ATTLIST Workspaces
-      rootPath CDATA #REQUIRED
-      defaultWorkspace CDATA #REQUIRED>
-
-    <!--
-        the Workspace element serves as a workspace configuration template;
-        it is used to create the initial workspace if there's no workspace yet
-        and for creating additional workspaces through the api
-    -->
-    <!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?)>
-    <!ATTLIST Workspace
-      name CDATA #REQUIRED>
-
-    <!--
-        the PersistenceManager element configures the persistence manager
-        to be used for the workspace; the class attribute specifies the
-        FQN of the class implementing the PersistenceManager interface
-    -->
-    <!ELEMENT PersistenceManager (param*)>
-    <!ATTLIST PersistenceManager
-      class CDATA #REQUIRED>
-
-    <!--
-        the SearchIndex element specifies the locaction of the search index
-        (used by the QueryHandler); the class attribute specifies the
-        FQN of the class implementing the QueryHandler interface.
-    -->
-    <!ELEMENT SearchIndex (param*,FileSystem?)>
-    <!ATTLIST SearchIndex
-      class CDATA #REQUIRED>
-
-    <!--
-        the Versioning element configures the persistence manager
-        to be used for persisting version state
-    -->
-    <!ELEMENT Versioning (FileSystem, PersistenceManager)>
-    <!ATTLIST Versioning
-      rootPath CDATA #REQUIRED
-    >
-]>
-<!-- Example Repository Configuration File -->
-<Repository>
-    <!--
-        virtual file system where the repository stores global state
-        (e.g. registered namespaces, custom node types, etc.)
-    -->
-    <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-        <param name="path" value="${rep.home}/repository"/>
-    </FileSystem>
-
-    <!--
-        security configuration
-    -->
-    <Security appName="Jackrabbit">
-        <!--
-            access manager:
-            class: FQN of class implementing the AccessManager interface
-        -->
-        <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager">
-            <!-- <param name="config" value="${rep.home}/access.xml"/> -->
-        </AccessManager>
-
-        <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
-           <!-- anonymous user name ('anonymous' is the default value) -->
-           <param name="anonymousId" value="anonymous"/>
-           <!--
-              default user name to be used instead of the anonymous user
-              when no login credentials are provided (unset by default)
-           -->
-           <!-- <param name="defaultUserId" value="superuser"/> -->
-        </LoginModule>
-    </Security>
-
-    <!--
-        location of workspaces root directory and name of default workspace
-    -->
-    <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
-    <!--
-        workspace configuration template:
-        used to create the initial workspace if there's no workspace yet
-    -->
-    <Workspace name="${wsp.name}">
-        <!--
-            virtual file system of the workspace:
-            class: FQN of class implementing the FileSystem interface
-        -->
-        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-            <param name="path" value="${wsp.home}"/>
-        </FileSystem>
-        <!--
-            persistence manager of the workspace:
-            class: FQN of class implementing the PersistenceManager interface
-        -->
-        <PersistenceManager class="org.apache.jackrabbit.core.state.db.DerbyPersistenceManager">
-          <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
-          <param name="schemaObjectPrefix" value="${wsp.name}_"/>
-        </PersistenceManager>
-        <!--
-            Search index and the file system it uses.
-            class: FQN of class implementing the QueryHandler interface
-        -->
-        <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-            <param name="path" value="${wsp.home}/index"/>
-        </SearchIndex>
-    </Workspace>
-
-    <!--
-        Configures the versioning
-    -->
-    <Versioning rootPath="${rep.home}/version">
-        <!--
-            Configures the filesystem to use for versioning for the respective
-            persistence manager
-        -->
-        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-            <param name="path" value="${rep.home}/version" />
-        </FileSystem>
-        
-        <!--
-            Configures the persistence manager to be used for persisting version state.
-            Please note that the current versioning implementation is based on
-            a 'normal' persistence manager, but this could change in future
-            implementations.
-        -->
-        <PersistenceManager class="org.apache.jackrabbit.core.state.db.DerbyPersistenceManager">
-          <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
-          <param name="schemaObjectPrefix" value="version_"/>
-        </PersistenceManager>
-    </Versioning>
-
-    <!--
-        Search index for content that is shared repository wide
-        (/jcr:system tree, contains mainly versions)
-    -->
-    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-        <param name="path" value="${rep.home}/repository/index"/>
-    </SearchIndex>
-</Repository>
+<?xml version="1.0"?>
+<!--
+   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.
+  -->
+<!DOCTYPE Repository [
+    <!--
+        the Repository element configures a repository instance;
+        individual workspaces of the repository are configured through
+        separate configuration files called workspace.xml which are
+        located in a subfolder of the workspaces root directory
+        (see Workspaces element).
+
+        it consists of
+
+            a FileSystem element (the virtual file system
+            used by the repository to persist global state such as
+            registered namespaces, custom node types, etc..
+
+            a Security element that specifies the name of the app-entry
+            in the JAAS config and the access manager
+
+            a Workspaces element that specifies to the location of
+            workspaces root directory and the name of default workspace
+
+            a Workspace element that is used as a workspace configuration
+            template; it is used to create the initial workspace if there's
+            no workspace yet and for creating additional workspaces through
+            the api
+
+            a Versioning element that is used for configuring
+            versioning-related settings
+
+            a SearchIndex element that is used for configuring Indexing-related
+            settings on the /jcr:system tree.
+    -->
+    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
+
+    <!--
+        a virtual file system
+    -->
+    <!ELEMENT FileSystem (param*)>
+    <!ATTLIST FileSystem
+      class CDATA #REQUIRED>
+
+    <!--
+        the Security element specifies the name (appName attribute)
+        of the JAAS configuration app-entry for this repository. 
+
+        it also specifies the access manager to be used (AccessManager element).
+    -->
+    <!ELEMENT Security (AccessManager, LoginModule?)>
+    <!ATTLIST Security
+      appName CDATA #REQUIRED>
+
+    <!--
+        the AccessManager element configures the access manager to be used by
+        this repository instance; the class attribute specifies the FQN of the
+        class implementing the AccessManager interface
+    -->
+    <!ELEMENT AccessManager (param*)>
+    <!ATTLIST AccessManager
+      class CDATA #REQUIRED>
+
+    <!--
+        generic parameter (name/value pair)
+    -->
+    <!ELEMENT param EMPTY>
+    <!ATTLIST param
+      name CDATA #REQUIRED
+      value CDATA #REQUIRED>
+
+     <!--
+        the LoginModule element optionally specifies a JAAS login module to
+        authenticate users. This feature allows the use of Jackrabbit in a
+        non-JAAS environment.
+    -->
+    <!ELEMENT LoginModule (param*)>
+    <!ATTLIST LoginModule
+      class CDATA #REQUIRED>
+
+   <!--
+        the Workspaces element specifies the workspaces root directory
+        (rootPath attribute) and the name of the default workspace
+        (defaultWorkspace attribute).
+
+        individual workspaces are configured through individual workspace.xml
+        files located in a subfolder each of the workspaces root directory.
+    -->
+    <!ELEMENT Workspaces EMPTY>
+    <!ATTLIST Workspaces
+      rootPath CDATA #REQUIRED
+      defaultWorkspace CDATA #REQUIRED>
+
+    <!--
+        the Workspace element serves as a workspace configuration template;
+        it is used to create the initial workspace if there's no workspace yet
+        and for creating additional workspaces through the api
+    -->
+    <!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?)>
+    <!ATTLIST Workspace
+      name CDATA #REQUIRED>
+
+    <!--
+        the PersistenceManager element configures the persistence manager
+        to be used for the workspace; the class attribute specifies the
+        FQN of the class implementing the PersistenceManager interface
+    -->
+    <!ELEMENT PersistenceManager (param*)>
+    <!ATTLIST PersistenceManager
+      class CDATA #REQUIRED>
+
+    <!--
+        the SearchIndex element specifies the locaction of the search index
+        (used by the QueryHandler); the class attribute specifies the
+        FQN of the class implementing the QueryHandler interface.
+    -->
+    <!ELEMENT SearchIndex (param*,FileSystem?)>
+    <!ATTLIST SearchIndex
+      class CDATA #REQUIRED>
+
+    <!--
+        the Versioning element configures the persistence manager
+        to be used for persisting version state
+    -->
+    <!ELEMENT Versioning (FileSystem, PersistenceManager)>
+    <!ATTLIST Versioning
+      rootPath CDATA #REQUIRED
+    >
+]>
+<!-- Example Repository Configuration File -->
+<Repository>
+    <!--
+        virtual file system where the repository stores global state
+        (e.g. registered namespaces, custom node types, etc.)
+    -->
+    <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+        <param name="path" value="${rep.home}/repository"/>
+    </FileSystem>
+
+    <!--
+        security configuration
+    -->
+    <Security appName="Jackrabbit">
+        <!--
+            access manager:
+            class: FQN of class implementing the AccessManager interface
+        -->
+        <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager">
+            <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+        </AccessManager>
+
+        <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+           <!-- anonymous user name ('anonymous' is the default value) -->
+           <param name="anonymousId" value="anonymous"/>
+           <!--
+              default user name to be used instead of the anonymous user
+              when no login credentials are provided (unset by default)
+           -->
+           <!-- <param name="defaultUserId" value="superuser"/> -->
+        </LoginModule>
+    </Security>
+
+    <!--
+        location of workspaces root directory and name of default workspace
+    -->
+    <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+    <!--
+        workspace configuration template:
+        used to create the initial workspace if there's no workspace yet
+    -->
+    <Workspace name="${wsp.name}">
+        <!--
+            virtual file system of the workspace:
+            class: FQN of class implementing the FileSystem interface
+        -->
+        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+            <param name="path" value="${wsp.home}"/>
+        </FileSystem>
+        <!--
+            persistence manager of the workspace:
+            class: FQN of class implementing the PersistenceManager interface
+        -->
+        <PersistenceManager class="org.apache.jackrabbit.core.state.db.DerbyPersistenceManager">
+          <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
+          <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+        </PersistenceManager>
+        <!--
+            Search index and the file system it uses.
+            class: FQN of class implementing the QueryHandler interface
+        -->
+        <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+            <param name="path" value="${wsp.home}/index"/>
+        </SearchIndex>
+    </Workspace>
+
+    <!--
+        Configures the versioning
+    -->
+    <Versioning rootPath="${rep.home}/version">
+        <!--
+            Configures the filesystem to use for versioning for the respective
+            persistence manager
+        -->
+        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+            <param name="path" value="${rep.home}/version" />
+        </FileSystem>
+        
+        <!--
+            Configures the persistence manager to be used for persisting version state.
+            Please note that the current versioning implementation is based on
+            a 'normal' persistence manager, but this could change in future
+            implementations.
+        -->
+        <PersistenceManager class="org.apache.jackrabbit.core.state.db.DerbyPersistenceManager">
+          <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
+          <param name="schemaObjectPrefix" value="version_"/>
+        </PersistenceManager>
+    </Versioning>
+
+    <!--
+        Search index for content that is shared repository wide
+        (/jcr:system tree, contains mainly versions)
+    -->
+    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+        <param name="path" value="${rep.home}/repository/index"/>
+    </SearchIndex>
+</Repository>

Propchange: jackrabbit/trunk/jackrabbit-jca/src/main/rar/repository.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/rar10/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/rar10/META-INF/ra.xml?view=diff&rev=483483&r1=483482&r2=483483
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/rar10/META-INF/ra.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/rar10/META-INF/ra.xml Thu Dec  7 07:19:51 2006
@@ -1,51 +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.
-  -->
-<!DOCTYPE connector PUBLIC
-    '-//Sun Microsystems, Inc.//DTD Connector 1.0//EN'
-    'http://java.sun.com/dtd/connector_1_0.dtd'>
-<connector>
-    <display-name>Jackrabbit JCR Adapter</display-name>
-    <vendor-name>Apache.org</vendor-name>
-    <spec-version>1.0</spec-version>
-    <eis-type>JCR Adapter</eis-type>
-    <version>1.0</version>
-    
-    <license>
-	<description>ASF</description>
-	<license-required>false</license-required>
-    </license>
-
-    <resourceadapter>
-	<managedconnectionfactory-class>org.apache.jackrabbit.jca.JCAManagedConnectionFactory</managedconnectionfactory-class>
-	<connectionfactory-interface>javax.jcr.Repository</connectionfactory-interface>
-	<connectionfactory-impl-class>org.apache.jackrabbit.jca.JCARepositoryHandle</connectionfactory-impl-class>
-	<connection-interface>javax.jcr.Session</connection-interface>
-	<connection-impl-class>org.apache.jackrabbit.jca.JCASessionHandle</connection-impl-class>
-	<transaction-support>XATransaction</transaction-support>
-	<config-property>
-	    <config-property-name>HomeDir</config-property-name>
-	    <config-property-type>java.lang.String</config-property-type>
-	</config-property>
-	<config-property>
-	    <config-property-name>ConfigFile</config-property-name>
-	    <config-property-type>java.lang.String</config-property-type>
-	</config-property>
-	<reauthentication-support>false</reauthentication-support>	
-    </resourceadapter>
-</connector>
-	   
+<?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.
+  -->
+<!DOCTYPE connector PUBLIC
+    '-//Sun Microsystems, Inc.//DTD Connector 1.0//EN'
+    'http://java.sun.com/dtd/connector_1_0.dtd'>
+<connector>
+    <display-name>Jackrabbit JCR Adapter</display-name>
+    <vendor-name>Apache.org</vendor-name>
+    <spec-version>1.0</spec-version>
+    <eis-type>JCR Adapter</eis-type>
+    <version>1.0</version>
+    
+    <license>
+	<description>ASF</description>
+	<license-required>false</license-required>
+    </license>
+
+    <resourceadapter>
+	<managedconnectionfactory-class>org.apache.jackrabbit.jca.JCAManagedConnectionFactory</managedconnectionfactory-class>
+	<connectionfactory-interface>javax.jcr.Repository</connectionfactory-interface>
+	<connectionfactory-impl-class>org.apache.jackrabbit.jca.JCARepositoryHandle</connectionfactory-impl-class>
+	<connection-interface>javax.jcr.Session</connection-interface>
+	<connection-impl-class>org.apache.jackrabbit.jca.JCASessionHandle</connection-impl-class>
+	<transaction-support>XATransaction</transaction-support>
+	<config-property>
+	    <config-property-name>HomeDir</config-property-name>
+	    <config-property-type>java.lang.String</config-property-type>
+	</config-property>
+	<config-property>
+	    <config-property-name>ConfigFile</config-property-name>
+	    <config-property-type>java.lang.String</config-property-type>
+	</config-property>
+	<reauthentication-support>false</reauthentication-support>	
+    </resourceadapter>
+</connector>
+	   

Propchange: jackrabbit/trunk/jackrabbit-jca/src/main/rar10/META-INF/ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native