portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jf...@apache.org
Subject cvs commit: jakarta-jetspeed/test/testdata/conf ResultMergeRemoveJetspeedResources.properties ResultMergeJetspeedResources.properties SrcJetspeedResources.properties MergeAddJetspeedResources.properties ResultMergeAddJetspeedResources.properties MergeRemoveJetspeedResources.properties JetspeedResources.properties MergeJetspeedResources.properties
Date Wed, 17 Mar 2004 20:08:40 GMT
jford       2004/03/17 12:08:40

  Modified:    test/testdata/conf
                        ResultMergeRemoveJetspeedResources.properties
                        ResultMergeJetspeedResources.properties
                        SrcJetspeedResources.properties
                        MergeAddJetspeedResources.properties
                        ResultMergeAddJetspeedResources.properties
                        MergeRemoveJetspeedResources.properties
                        JetspeedResources.properties
                        MergeJetspeedResources.properties
  Log:
  Added Apache License 2.0
  
  Revision  Changes    Path
  1.3       +14 -0     jakarta-jetspeed/test/testdata/conf/ResultMergeRemoveJetspeedResources.properties
  
  Index: ResultMergeRemoveJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/ResultMergeRemoveJetspeedResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResultMergeRemoveJetspeedResources.properties	21 Apr 2003 22:18:28 -0000	1.2
  +++ ResultMergeRemoveJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.3
  @@ -1,3 +1,17 @@
  +# 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.
  +
   ################################################################################
   
   # Jetspeed Configuration                             
  
  
  
  1.3       +14 -0     jakarta-jetspeed/test/testdata/conf/ResultMergeJetspeedResources.properties
  
  Index: ResultMergeJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/ResultMergeJetspeedResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResultMergeJetspeedResources.properties	21 Apr 2003 22:18:28 -0000	1.2
  +++ ResultMergeJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.3
  @@ -1,3 +1,17 @@
  +# 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.
  +
   ################################################################################
   
   # Jetspeed Configuration                             
  
  
  
  1.3       +14 -0     jakarta-jetspeed/test/testdata/conf/SrcJetspeedResources.properties
  
  Index: SrcJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/SrcJetspeedResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SrcJetspeedResources.properties	21 Apr 2003 22:18:28 -0000	1.2
  +++ SrcJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.3
  @@ -1,3 +1,17 @@
  +# 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.
  +
   ################################################################################
   
   # Jetspeed Configuration                             
  
  
  
  1.2       +27 -14    jakarta-jetspeed/test/testdata/conf/MergeAddJetspeedResources.properties
  
  Index: MergeAddJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/MergeAddJetspeedResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MergeAddJetspeedResources.properties	11 Feb 2003 23:15:37 -0000	1.1
  +++ MergeAddJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.2
  @@ -1,15 +1,28 @@
  -
  -##
  -## Using torque's old pool
  -##
  -torque.dsfactory.efo.connection.driver = com.microsoft.jdbc.sqlserver.SQLServerDriver
  -torque.dsfactory.efo.connection.url = jdbc:microsoft:sqlserver://myserver:1433;DatabaseName=EFO_CC_TEST;SelectMethod=cursor
  -torque.dsfactory.efo.connection.user = myUser
  -torque.dsfactory.efo.connection.password = myPassword
  -
  -torque.dsfactory.efo.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
  -
  -# The number of database connections to cache per ConnectionPool instance (specified per
database)
  -torque.dsfactory.efo.pool.defaultMaxConnections=10
  -torque.dsfactory.efo.pool.maxExpiryTime=3600
  +# 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.
  +
  +##
  +## Using torque's old pool
  +##
  +torque.dsfactory.efo.connection.driver = com.microsoft.jdbc.sqlserver.SQLServerDriver
  +torque.dsfactory.efo.connection.url = jdbc:microsoft:sqlserver://myserver:1433;DatabaseName=EFO_CC_TEST;SelectMethod=cursor
  +torque.dsfactory.efo.connection.user = myUser
  +torque.dsfactory.efo.connection.password = myPassword
  +
  +torque.dsfactory.efo.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
  +
  +# The number of database connections to cache per ConnectionPool instance (specified per
database)
  +torque.dsfactory.efo.pool.defaultMaxConnections=10
  +torque.dsfactory.efo.pool.maxExpiryTime=3600
   torque.dsfactory.efo.pool.connectionWaitTimeout=10
  
  
  
  1.3       +14 -0     jakarta-jetspeed/test/testdata/conf/ResultMergeAddJetspeedResources.properties
  
  Index: ResultMergeAddJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/ResultMergeAddJetspeedResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResultMergeAddJetspeedResources.properties	21 Apr 2003 22:18:28 -0000	1.2
  +++ ResultMergeAddJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.3
  @@ -1,3 +1,17 @@
  +# 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.
  +
   ################################################################################
   
   # Jetspeed Configuration                             
  
  
  
  1.2       +24 -10    jakarta-jetspeed/test/testdata/conf/MergeRemoveJetspeedResources.properties
  
  Index: MergeRemoveJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/MergeRemoveJetspeedResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MergeRemoveJetspeedResources.properties	11 Feb 2003 23:15:37 -0000	1.1
  +++ MergeRemoveJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.2
  @@ -1,11 +1,25 @@
  --contentfeeds.
  -
  --#contentfeeds.
  -
  --daemon.
  -
  --services.DaemonFactory
  -
  --content.
  -
  +# 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.
  +
  +-contentfeeds.
  +
  +-#contentfeeds.
  +
  +-daemon.
  +
  +-services.DaemonFactory
  +
  +-content.
  +
   -#content.
  
  
  
  1.3       +14 -0     jakarta-jetspeed/test/testdata/conf/JetspeedResources.properties
  
  Index: JetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/JetspeedResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedResources.properties	13 Aug 2003 04:18:17 -0000	1.2
  +++ JetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.3
  @@ -1,3 +1,17 @@
  +# 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.
  +
   ################################################################################
   
   # Jetspeed Configuration                             
  
  
  
  1.2       +29 -15    jakarta-jetspeed/test/testdata/conf/MergeJetspeedResources.properties
  
  Index: MergeJetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/test/testdata/conf/MergeJetspeedResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MergeJetspeedResources.properties	11 Feb 2003 23:15:37 -0000	1.1
  +++ MergeJetspeedResources.properties	17 Mar 2004 20:08:40 -0000	1.2
  @@ -1,16 +1,30 @@
  -portalpage.title_prefix=Upstate Portal
  -site.stylesheet=css/upstate.css
  -services.PortalToolkit.default.skin=upstate-skin
  -topnav.logo.file=images/upstate_logo.gif
  -
  -leftnav.enable=true
  -leftnav.vm=left-upstate.vm
  -topnav.enable=true
  -topnav.vm=top-upstate.vm
  -
  -
  -services.TemplateLocator.templateRoot=/WEB-INF/templates
  -
  -
  -# The Default Template Locator (resolver)
  +# 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.
  +
  +portalpage.title_prefix=Upstate Portal
  +site.stylesheet=css/upstate.css
  +services.PortalToolkit.default.skin=upstate-skin
  +topnav.logo.file=images/upstate_logo.gif
  +
  +leftnav.enable=true
  +leftnav.vm=left-upstate.vm
  +topnav.enable=true
  +topnav.vm=top-upstate.vm
  +
  +
  +services.TemplateLocator.templateRoot=/WEB-INF/templates
  +
  +
  +# The Default Template Locator (resolver)
   services.TemplateLocator.classname=org.apache.jetspeed.services.template.JetspeedTemplateLocatorService
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message