Author: struberg
Date: Tue Aug 17 07:57:31 2010
New Revision: 986227
URL: http://svn.apache.org/viewvc?rev=986227&view=rev
Log:
OWB-441 migrate various openwebbeans-*.properties to the new schema
Added:
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(contents, props changed)
- copied, changed from r985299,
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-common.properties
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(contents, props changed)
- copied, changed from r985299,
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
openwebbeans/trunk/webbeans-jms/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-jsf12/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Removed:
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-common.properties
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties
openwebbeans/trunk/webbeans-jsf12/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties
Copied:
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(from r985299,
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-common.properties)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?p2=openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans.properties&p1=openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-common.properties&r1=985299&r2=986227&rev=986227&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-common.properties
(original)
+++
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Tue Aug 17 07:57:31 2010
@@ -23,9 +23,12 @@
#---------------------------------------------------------------
################################################################################################
-################################### DEFAULT SPI CONFIGURATION SECTION
##########################
+################################ COMMON EE SPI CONFIGURATION SECTION
##########################
################################################################################################
+configuration.ordinal=15
+
+
################################### Default JNDI Service
#######################################
#Default implementation of org.apache.webbeans.corespi.JNDIService.
org.apache.webbeans.spi.JNDIService=org.apache.webbeans.ee.common.services.JNDIServiceEnterpriseImpl
Propchange:
openwebbeans/trunk/webbeans-ee-common/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(from r985299,
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?p2=openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties&p1=openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties&r1=985299&r2=986227&rev=986227&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Tue Aug 17 07:57:31 2010
@@ -22,10 +22,14 @@
#
#---------------------------------------------------------------
+
################################################################################################
################################### DEFAULT SPI CONFIGURATION SECTION
##########################
################################################################################################
+# this is the basic configuration, thus it has a very low ordinal of 10
+configuration.ordinal=10
+
################################### Default Container Lifecycle
################################
#Default implementation of org.apache.webbeans.corespi.ContainerLifecycle.
org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.lifecycle.StandaloneLifeCycle
Propchange:
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
openwebbeans/trunk/webbeans-jms/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=986227&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-jms/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(added)
+++
openwebbeans/trunk/webbeans-jms/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Tue Aug 17 07:57:31 2010
@@ -0,0 +1,30 @@
+#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.
+#---------------------------------------------------------------
+# The default configuration for OpenWebBeans
+#
+# The default configuration is intended for a JDK and a simple ServletContainer
+# like jetty, resin or tomcat.
+#
+#---------------------------------------------------------------
+
+configuration.ordinal=16
+
+#################################### JMS ConnectionFactory JNDI Name
###########################
+# JMS ConnectionFactory instance global jndi name.
+org.apache.webbeans.spi.JNDIService.jmsConnectionFactoryJndi=ConnectionFactory
+################################################################################################
Added:
openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=986227&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(added)
+++
openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Tue Aug 17 07:57:31 2010
@@ -0,0 +1,39 @@
+#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.
+#---------------------------------------------------------------
+# The default configuration for OpenWebBeans
+#
+# The default configuration is intended for a JDK and a simple ServletContainer
+# like jetty, resin or tomcat.
+#
+#---------------------------------------------------------------
+
+configuration.ordinal=12
+
+#################################### Conversation Context Removal Thread
Delay##################
+#Converation contexts are removed when idle timeout > timeout. Default timeout
is 30 mins.
+org.apache.webbeans.conversation.Conversation.periodicDelay=1800000
+################################################################################################
+
+################################### Default Conversation Service
###############################
+#Default implementation of org.apache.webbeans.corespi.ConversationService.
+org.apache.webbeans.spi.ConversationService=org.apache.webbeans.jsf.DefaultConversationService
+################################################################################################
+
+################################# Conversation Support
#########################################
+org.apache.webbeans.application.supportsConversation=true
+################################################################################################
Added:
openwebbeans/trunk/webbeans-jsf12/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=986227&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-jsf12/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(added)
+++
openwebbeans/trunk/webbeans-jsf12/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Tue Aug 17 07:57:31 2010
@@ -0,0 +1,40 @@
+#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.
+#---------------------------------------------------------------
+# The default configuration for OpenWebBeans
+#
+# The default configuration is intended for a JDK and a simple ServletContainer
+# like jetty, resin or tomcat.
+#
+#---------------------------------------------------------------
+
+configuration.ordinal= 12
+
+
+#################################### Conversation Context Removal Thread
Delay##################
+#Converation contexts are removed when idle timeout > timeout. Default timeout
is 30 mins.
+org.apache.webbeans.conversation.Conversation.periodicDelay=1800000
+################################################################################################
+
+################################### Default Conversation Service
###############################
+#Default implementation of org.apache.webbeans.corespi.ConversationService.
+org.apache.webbeans.spi.ConversationService=org.apache.webbeans.jsf12.DefaultConversationService
+################################################################################################
+
+################################# Conversation Support
#########################################
+org.apache.webbeans.application.supportsConversation=true
+################################################################################################
Added:
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=986227&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(added)
+++
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Tue Aug 17 07:57:31 2010
@@ -0,0 +1,69 @@
+#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.
+#---------------------------------------------------------------
+# The default configuration for OpenWebBeans
+#
+# The default configuration is intended for a JDK and a simple ServletContainer
+# like jetty, resin or tomcat.
+#
+#---------------------------------------------------------------
+
+################################################################################################
+################################### WEB SPI CONFIGURATION SECTION
##########################
+################################################################################################
+
+configuration.ordinal=11
+
+################################### WEB Container Lifecycle
################################
+#Default implementation of org.apache.webbeans.corespi.ContainerLifecycle.
+org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.web.lifecycle.WebContainerLifecycle
+################################################################################################
+
+################################### WEB Scanner Service
####################################
+#Default implementation of org.apache.webbeans.corespi.ScannerService.
+org.apache.webbeans.spi.ScannerService=org.apache.webbeans.web.scanner.WebScannerService
+################################################################################################
+
+################################### WEB Contexts Service
####################################
+#Default implementation of org.apache.webbeans.corespi.ContextsService.
+org.apache.webbeans.spi.ContextsService=org.apache.webbeans.web.context.WebContextsService
+################################################################################################
+
+################################### Default Resource Injection Service
#########################
+#Default implementation of org.apache.webbeans.corespi.ResourceInjectionService
+org.apache.webbeans.spi.ResourceInjectionService=org.apache.webbeans.resource.spi.se.StandaloneResourceInjectionService
+################################################################################################
+
+################################################################################################
+#################################### SEVERAL WEB CONFIGURATION PARAMETERS
######################
+################################################################################################
+
+################################## Application Development is JSP
##############################
+#Used to register WebBeansELResolver with JSP EL
+org.apache.webbeans.application.jsp=false
+################################################################################################
+
+################################# Application Development JSF Version is 2.0
###################
+#Add extra extensions for JSF2, for example adding ViewScope
+org.apache.webbeans.application.useJSF2Extensions=false
+################################################################################################
+
+################################ Failover Service
#############################################
+org.apache.webbeans.spi.FailOverService=org.apache.webbeans.web.failover.DefaultOwbFailOverService
+org.apache.webbeans.web.failover.issupportfailover=false
+org.apache.webbeans.web.failover.issupportpassivation=false
+##############################################################################################
