Author: struberg
Date: Wed Feb 23 15:06:41 2011
New Revision: 1073766
URL: http://svn.apache.org/viewvc?rev=1073766&view=rev
Log:
OWB-393 also remove configuration and documentation
Modified:
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/beans.xml
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-doc/src/docbkx/userguide/chapter1.xml
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Modified:
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/beans.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/beans.xml?rev=1073766&r1=1073765&r2=1073766&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/beans.xml
(original)
+++ openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/beans.xml
Wed Feb 23 15:06:41 2011
@@ -17,7 +17,4 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<WebBeans xmlns="urn:java:ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="urn:java:ee
http://java.sun.com/jee/beans-1.0.xsd";>
-</WebBeans>
\ No newline at end of file
+<beans/>
Modified:
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1073766&r1=1073765&r2=1073766&view=diff
==============================================================================
---
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Wed Feb 23 15:06:41 2011
@@ -24,10 +24,7 @@
#general configuration section
-#use OWB Specific XML Configuration
-org.apache.webbeans.useOwbSpecificXmlConfig=true
-
org.apache.webbeans.application.useJSF2Extensions=false
#JNDI Enterprise Implementation
-org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.ee.JNDIServiceEnterpriseImpl
\ No newline at end of file
+org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.ee.JNDIServiceEnterpriseImpl
Modified: openwebbeans/trunk/webbeans-doc/src/docbkx/userguide/chapter1.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-doc/src/docbkx/userguide/chapter1.xml?rev=1073766&r1=1073765&r2=1073766&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-doc/src/docbkx/userguide/chapter1.xml (original)
+++ openwebbeans/trunk/webbeans-doc/src/docbkx/userguide/chapter1.xml Wed Feb
23 15:06:41 2011
@@ -228,11 +228,6 @@ org.apache.webbeans.spi.JNDIService=org.
</listitem>
<listitem>
-
<para><emphasis>org.apache.webbeans.useOwbSpecificXmlConfig:</emphasis> Use
OpenWebBeans specific configuration or not. Generally it is not required
- to change this. Not portable!</para>
- </listitem>
-
- <listitem>
<para><emphasis>org.apache.webbeans.fieldInjection.useOwbSpecificInjection:</emphasis>
Use @Inject annotation at injection fields or not. If it is set to true
you can inject objects into
beans without @Inject annotation. Not portable!</para>
</listitem>
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1073766&r1=1073765&r2=1073766&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Wed Feb 23 15:06:41 2011
@@ -60,10 +60,6 @@ public class OpenWebBeansConfiguration
*/
public static final String INTERCEPTOR_FORCE_NO_CHECKED_EXCEPTIONS =
"org.apache.webbeans.forceNoCheckedExceptions";
- /**Use OWB Specific XML Configuration or Strict Spec XML*/
- @Deprecated //Not use any more
- public static final String USE_OWB_SPECIFIC_XML_CONFIGURATION =
"org.apache.webbeans.useOwbSpecificXmlConfig";
-
/**Use EJB Discovery or not*/
public static final String USE_EJB_DISCOVERY =
"org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService";
Modified:
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1073766&r1=1073765&r2=1073766&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Wed Feb 23 15:06:41 2011
@@ -83,12 +83,6 @@ org.apache.webbeans.application.useEJBIn
# org.apache.webbeans.forceNoCheckedExceptions=true
################################################################################################
-################################### Use OWB Specific XML Configuration
#########################
-#Use OWB Specific XML configuration. Not recommended to use as true.
-#It will be removed in future development.
-org.apache.webbeans.useOwbSpecificXmlConfig=false
-################################################################################################
-
################################## OWB Specific Injection
######################################
#If false, uses spec. defined injection with @Inject. Not recommended use as
true.
#It will be removed in future development.
