You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/08/24 11:31:54 UTC
svn commit: r239586 - in /portals/jetspeed-2/trunk/components:
capability/src/java/JETSPEED-INF/ojb/ portal/
portal/src/test/JETSPEED-INF/spring/ profiler/src/java/JETSPEED-INF/ojb/
Author: sgala
Date: Wed Aug 24 02:31:40 2005
New Revision: 239586
URL: http://svn.apache.org/viewcvs?rev=239586&view=rev
Log:
more svn:eol-style native
Modified:
portals/jetspeed-2/trunk/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml (contents, props changed)
portals/jetspeed-2/trunk/components/portal/maven.xml (contents, props changed)
portals/jetspeed-2/trunk/components/portal/project.xml (contents, props changed)
portals/jetspeed-2/trunk/components/portal/src/test/JETSPEED-INF/spring/user-info.xml (contents, props changed)
portals/jetspeed-2/trunk/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml (contents, props changed)
Modified: portals/jetspeed-2/trunk/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml?rev=239586&r1=239585&r2=239586&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml Wed Aug 24 02:31:40 2005
@@ -1,210 +1,210 @@
-<!--
-Copyright 2004 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.
--->
-
-<!--
- - C A P A B I L I T Y M A P P I N G
--->
-
-<descriptor-repository version="1.0">
-<!--
- - M E D I A T Y P E
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl"
- table="MEDIA_TYPE"
- >
-
- <field-descriptor
- name="mediatypeId"
- column="MEDIATYPE_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="characterSet"
- column="CHARACTER_SET"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="title"
- column="TITLE"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="description"
- column="DESCRIPTION"
- jdbc-type="VARCHAR"
- />
-
- <collection-descriptor
- name="capabilities"
- element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
- auto-retrieve="true"
- indirection-table="CLIENT_TO_CAPABILITY"
- >
- <fk-pointing-to-this-class column="CLIENT_ID"/>
- <fk-pointing-to-element-class column="CAPABILITY_ID"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="mimetypes"
- element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
- auto-retrieve="true"
- indirection-table="MEDIATYPE_TO_MIMETYPE"
- >
- <fk-pointing-to-this-class column="MEDIATYPE_ID"/>
- <fk-pointing-to-element-class column="MIMETYPE_ID"/>
- </collection-descriptor>
-
- </class-descriptor>
-
- <!--
- - C L I E N T
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.ClientImpl"
- table="CLIENT"
- >
- <field-descriptor
- name="clientId"
- column="CLIENT_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="evalOrder"
- column="EVAL_ORDER"
- jdbc-type="INTEGER"
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="userAgentPattern"
- column="USER_AGENT_PATTERN"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="manufacturer"
- column="MANUFACTURER"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="model"
- column="MODEL"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="version"
- column="VERSION"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="preferredMimeTypeId"
- column="PREFERRED_MIMETYPE_ID"
- jdbc-type="INTEGER"
- />
-
- <collection-descriptor
- name="capabilities"
- element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
-
- indirection-table="CLIENT_TO_CAPABILITY"
- >
- <fk-pointing-to-this-class column="CLIENT_ID"/>
- <fk-pointing-to-element-class column="CAPABILITY_ID"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="mimetypes"
- element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
- auto-retrieve="true"
- indirection-table="CLIENT_TO_MIMETYPE"
- >
- <fk-pointing-to-this-class column="CLIENT_ID"/>
- <fk-pointing-to-element-class column="MIMETYPE_ID"/>
- </collection-descriptor>
-
- </class-descriptor>
-
-<!--
- - M I M E T Y P E
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
- table="MIMETYPE"
- >
- <field-descriptor
- name="mimeTypeId"
- column="MIMETYPE_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
- </class-descriptor>
-
-<!--
- - C A P A B I L I T Y
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
- table="CAPABILITY"
- >
- <field-descriptor
- name="capabilityId"
- column="CAPABILITY_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="name"
- column="CAPABILITY"
- jdbc-type="VARCHAR"
- />
-
- </class-descriptor>
-
-</descriptor-repository>
+<!--
+Copyright 2004 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.
+-->
+
+<!--
+ - C A P A B I L I T Y M A P P I N G
+-->
+
+<descriptor-repository version="1.0">
+<!--
+ - M E D I A T Y P E
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl"
+ table="MEDIA_TYPE"
+ >
+
+ <field-descriptor
+ name="mediatypeId"
+ column="MEDIATYPE_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="characterSet"
+ column="CHARACTER_SET"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="title"
+ column="TITLE"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="description"
+ column="DESCRIPTION"
+ jdbc-type="VARCHAR"
+ />
+
+ <collection-descriptor
+ name="capabilities"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
+ auto-retrieve="true"
+ indirection-table="CLIENT_TO_CAPABILITY"
+ >
+ <fk-pointing-to-this-class column="CLIENT_ID"/>
+ <fk-pointing-to-element-class column="CAPABILITY_ID"/>
+ </collection-descriptor>
+
+ <collection-descriptor
+ name="mimetypes"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
+ auto-retrieve="true"
+ indirection-table="MEDIATYPE_TO_MIMETYPE"
+ >
+ <fk-pointing-to-this-class column="MEDIATYPE_ID"/>
+ <fk-pointing-to-element-class column="MIMETYPE_ID"/>
+ </collection-descriptor>
+
+ </class-descriptor>
+
+ <!--
+ - C L I E N T
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.ClientImpl"
+ table="CLIENT"
+ >
+ <field-descriptor
+ name="clientId"
+ column="CLIENT_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+ <field-descriptor
+ name="evalOrder"
+ column="EVAL_ORDER"
+ jdbc-type="INTEGER"
+ />
+
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="userAgentPattern"
+ column="USER_AGENT_PATTERN"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="manufacturer"
+ column="MANUFACTURER"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="model"
+ column="MODEL"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="version"
+ column="VERSION"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="preferredMimeTypeId"
+ column="PREFERRED_MIMETYPE_ID"
+ jdbc-type="INTEGER"
+ />
+
+ <collection-descriptor
+ name="capabilities"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
+
+ indirection-table="CLIENT_TO_CAPABILITY"
+ >
+ <fk-pointing-to-this-class column="CLIENT_ID"/>
+ <fk-pointing-to-element-class column="CAPABILITY_ID"/>
+ </collection-descriptor>
+
+ <collection-descriptor
+ name="mimetypes"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
+ auto-retrieve="true"
+ indirection-table="CLIENT_TO_MIMETYPE"
+ >
+ <fk-pointing-to-this-class column="CLIENT_ID"/>
+ <fk-pointing-to-element-class column="MIMETYPE_ID"/>
+ </collection-descriptor>
+
+ </class-descriptor>
+
+<!--
+ - M I M E T Y P E
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
+ table="MIMETYPE"
+ >
+ <field-descriptor
+ name="mimeTypeId"
+ column="MIMETYPE_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+ </class-descriptor>
+
+<!--
+ - C A P A B I L I T Y
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
+ table="CAPABILITY"
+ >
+ <field-descriptor
+ name="capabilityId"
+ column="CAPABILITY_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+ <field-descriptor
+ name="name"
+ column="CAPABILITY"
+ jdbc-type="VARCHAR"
+ />
+
+ </class-descriptor>
+
+</descriptor-repository>
Propchange: portals/jetspeed-2/trunk/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/components/portal/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/maven.xml?rev=239586&r1=239585&r2=239586&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/maven.xml Wed Aug 24 02:31:40 2005
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2004 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.
--->
-<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
-
- <!-- Target of maven test:single test -->
- <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager' />
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004 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.
+-->
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
+
+ <!-- Target of maven test:single test -->
+ <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager' />
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/portal/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/project.xml?rev=239586&r1=239585&r2=239586&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Wed Aug 24 02:31:40 2005
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright 2004 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.
-
- $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project>
- <extend>${basedir}/../../jetspeed-components.xml</extend>
- <id>jetspeed-portal</id>
- <name>Jetspeed-2 Portal Components</name>
- <package>org.apache.jetspeed</package>
- <description>Portal Components</description>
- <shortDescription>Portal Components</shortDescription>
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portal/</url>
- </repository>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*</include>
- </includes>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>repository_database.xml</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/log4j</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/db-ojb</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
- </resource>
- </resources>
-
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
-
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2004 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.
+
+ $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project>
+ <extend>${basedir}/../../jetspeed-components.xml</extend>
+ <id>jetspeed-portal</id>
+ <name>Jetspeed-2 Portal Components</name>
+ <package>org.apache.jetspeed</package>
+ <description>Portal Components</description>
+ <shortDescription>Portal Components</shortDescription>
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portal/</url>
+ </repository>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>repository_database.xml</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/db-ojb</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
+ </resource>
+ </resources>
+
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/portal/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/components/portal/src/test/JETSPEED-INF/spring/user-info.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/JETSPEED-INF/spring/user-info.xml?rev=239586&r1=239585&r2=239586&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/JETSPEED-INF/spring/user-info.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/JETSPEED-INF/spring/user-info.xml Wed Aug 24 02:31:40 2005
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-Copyright 2004 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.
--->
-<beans>
- <!-- User Info -->
- <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
- class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
-
- </bean>
-
- <bean id="org.apache.jetspeed.userinfo.MultiUserInfoManager"
- class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
- <property name="portletRegistry">
- <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
- </property>
- <property name="sources">
- <list>
- <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
- </list>
- </property>
- </bean>
-
- <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"
- class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">
- <property name="userManager">
- <ref bean="org.apache.jetspeed.security.UserManager"/>
- </property>
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 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.
+-->
+<beans>
+ <!-- User Info -->
+ <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
+ >
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
+ <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+
+ </bean>
+
+ <bean id="org.apache.jetspeed.userinfo.MultiUserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
+ <property name="portletRegistry">
+ <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
+ </property>
+ <property name="sources">
+ <list>
+ <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"
+ class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">
+ <property name="userManager">
+ <ref bean="org.apache.jetspeed.security.UserManager"/>
+ </property>
+ </bean>
+
</beans>
Propchange: portals/jetspeed-2/trunk/components/portal/src/test/JETSPEED-INF/spring/user-info.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml?rev=239586&r1=239585&r2=239586&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml Wed Aug 24 02:31:40 2005
@@ -1,180 +1,180 @@
-<!--
-Copyright 2004 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.
--->
-<!--
- - P R O F I L I N G R U L E
--->
- <descriptor-repository version="1.0">
- <class-descriptor class="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule">
- <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule" />
- <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" />
- </class-descriptor>
-
-<class-descriptor
- class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
- table="PROFILING_RULE"
->
- <field-descriptor
- name="id"
- column="RULE_ID"
- jdbc-type="VARCHAR"
- primarykey="true"
- autoincrement="false"
- />
- <field-descriptor
- name="ojbConcreteClass"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="title"
- column="TITLE"
- jdbc-type="VARCHAR"
- />
- <collection-descriptor
- name="criteria"
- element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
- auto-delete="object"
- auto-update = "object"
- auto-retrieve = "true"
- >
- <inverse-foreignkey field-ref="ruleId"/>
- </collection-descriptor>
-
-
-</class-descriptor>
-
-<class-descriptor
- class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
- table="PROFILING_RULE"
->
- <field-descriptor
- name="id"
- column="RULE_ID"
- jdbc-type="VARCHAR"
- primarykey="true"
- autoincrement="false"
- />
- <field-descriptor
- name="ojbConcreteClass"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="title"
- column="TITLE"
- jdbc-type="VARCHAR"
- />
- <collection-descriptor
- name="criteria"
- element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
- auto-retrieve="true"
- >
- <inverse-foreignkey field-ref="ruleId"/>
- </collection-descriptor>
-</class-descriptor>
-
-<!--
- - R U L E C R I T E R I O N
--->
-
-<class-descriptor
- class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
- table="RULE_CRITERION"
->
- <field-descriptor
- name="id"
- column="CRITERION_ID"
- jdbc-type="VARCHAR"
- primarykey="true"
- autoincrement="true"
- />
- <field-descriptor
- name="ruleId"
- column="RULE_ID"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="fallbackOrder"
- column="FALLBACK_ORDER"
- jdbc-type="INTEGER"
- />
- <field-descriptor
- name="type"
- column="REQUEST_TYPE"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="value"
- column="COLUMN_VALUE"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="fallbackType"
- jdbc-type="INTEGER"
- column="FALLBACK_TYPE"
- />
-
-</class-descriptor>
-
-<!--
- - P R I N C I P A L R U L E
--->
-
-<class-descriptor
- class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl"
- table="PRINCIPAL_RULE_ASSOC"
->
- <field-descriptor
- name="principalName"
- column="PRINCIPAL_NAME"
- jdbc-type="VARCHAR"
- primarykey="true"
- autoincrement="false"
- />
- <field-descriptor
- name="locatorName"
- column="LOCATOR_NAME"
- jdbc-type="VARCHAR"
- primarykey="true"
- autoincrement="false"
- />
- <field-descriptor
- name="ruleId"
- column="RULE_ID"
- jdbc-type="VARCHAR"
- />
- <reference-descriptor
- name="profilingRule"
- class-ref="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule"
- auto-delete="false"
- auto-retrieve="true"
- >
- <foreignkey field-ref="ruleId"/>
- </reference-descriptor>
-
-</class-descriptor>
-
-</descriptor-repository>
-
-
-
-
+<!--
+Copyright 2004 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.
+-->
+<!--
+ - P R O F I L I N G R U L E
+-->
+ <descriptor-repository version="1.0">
+ <class-descriptor class="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule">
+ <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule" />
+ <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" />
+ </class-descriptor>
+
+<class-descriptor
+ class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
+ table="PROFILING_RULE"
+>
+ <field-descriptor
+ name="id"
+ column="RULE_ID"
+ jdbc-type="VARCHAR"
+ primarykey="true"
+ autoincrement="false"
+ />
+ <field-descriptor
+ name="ojbConcreteClass"
+ column="CLASS_NAME"
+ jdbc-type="VARCHAR"
+ />
+ <field-descriptor
+ name="title"
+ column="TITLE"
+ jdbc-type="VARCHAR"
+ />
+ <collection-descriptor
+ name="criteria"
+ element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
+ auto-delete="object"
+ auto-update = "object"
+ auto-retrieve = "true"
+ >
+ <inverse-foreignkey field-ref="ruleId"/>
+ </collection-descriptor>
+
+
+</class-descriptor>
+
+<class-descriptor
+ class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
+ table="PROFILING_RULE"
+>
+ <field-descriptor
+ name="id"
+ column="RULE_ID"
+ jdbc-type="VARCHAR"
+ primarykey="true"
+ autoincrement="false"
+ />
+ <field-descriptor
+ name="ojbConcreteClass"
+ column="CLASS_NAME"
+ jdbc-type="VARCHAR"
+ />
+ <field-descriptor
+ name="title"
+ column="TITLE"
+ jdbc-type="VARCHAR"
+ />
+ <collection-descriptor
+ name="criteria"
+ element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
+ auto-retrieve="true"
+ >
+ <inverse-foreignkey field-ref="ruleId"/>
+ </collection-descriptor>
+</class-descriptor>
+
+<!--
+ - R U L E C R I T E R I O N
+-->
+
+<class-descriptor
+ class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
+ table="RULE_CRITERION"
+>
+ <field-descriptor
+ name="id"
+ column="CRITERION_ID"
+ jdbc-type="VARCHAR"
+ primarykey="true"
+ autoincrement="true"
+ />
+ <field-descriptor
+ name="ruleId"
+ column="RULE_ID"
+ jdbc-type="VARCHAR"
+ />
+ <field-descriptor
+ name="fallbackOrder"
+ column="FALLBACK_ORDER"
+ jdbc-type="INTEGER"
+ />
+ <field-descriptor
+ name="type"
+ column="REQUEST_TYPE"
+ jdbc-type="VARCHAR"
+ />
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+ <field-descriptor
+ name="value"
+ column="COLUMN_VALUE"
+ jdbc-type="VARCHAR"
+ />
+ <field-descriptor
+ name="fallbackType"
+ jdbc-type="INTEGER"
+ column="FALLBACK_TYPE"
+ />
+
+</class-descriptor>
+
+<!--
+ - P R I N C I P A L R U L E
+-->
+
+<class-descriptor
+ class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl"
+ table="PRINCIPAL_RULE_ASSOC"
+>
+ <field-descriptor
+ name="principalName"
+ column="PRINCIPAL_NAME"
+ jdbc-type="VARCHAR"
+ primarykey="true"
+ autoincrement="false"
+ />
+ <field-descriptor
+ name="locatorName"
+ column="LOCATOR_NAME"
+ jdbc-type="VARCHAR"
+ primarykey="true"
+ autoincrement="false"
+ />
+ <field-descriptor
+ name="ruleId"
+ column="RULE_ID"
+ jdbc-type="VARCHAR"
+ />
+ <reference-descriptor
+ name="profilingRule"
+ class-ref="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule"
+ auto-delete="false"
+ auto-retrieve="true"
+ >
+ <foreignkey field-ref="ruleId"/>
+ </reference-descriptor>
+
+</class-descriptor>
+
+</descriptor-repository>
+
+
+
+
Propchange: portals/jetspeed-2/trunk/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org