You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2011/11/17 03:19:27 UTC
svn commit: r1203020 [7/29] - in
/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1: eclipse/
plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/
plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/application/
plugins/org.apache.geronimo....
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml Thu Nov 17 02:19:12 2011
@@ -1,70 +1,70 @@
-<?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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>org.apache.geronimo.testsuite</sys:groupId>
- <sys:artifactId>test-security</sys:artifactId>
- <sys:version>2.2-SNAPSHOT</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/demo</context-root>
-
- <security-realm-name>demo-properties-realm</security-realm-name>
-
- <sec:security>
- <sec:default-principal>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="izumi"/>
- </sec:default-principal>
- <sec:role-mappings>
- <sec:role role-name="content-administrator">
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="it" designated-run-as="true"/>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="metro"/>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="george"/>
- </sec:role>
- </sec:role-mappings>
- </sec:security>
-
- <gbean name="demo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <attribute name="realmName">demo-properties-realm</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <xml-reference name="LoginModuleConfiguration">
- <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
- <log:login-module control-flag="REQUIRED" wrap-principals="false">
- <log:login-domain-name>demo-properties-realm</log:login-domain-name>
- <log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
- <log:option name="usersURI">var/security/demo_users.properties</log:option>
- <log:option name="groupsURI">var/security/demo_groups.properties</log:option>
- </log:login-module>
- </log:login-config>
- </xml-reference>
- </gbean>
-
-</web-app>
+<?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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>org.apache.geronimo.testsuite</sys:groupId>
+ <sys:artifactId>test-security</sys:artifactId>
+ <sys:version>2.2-SNAPSHOT</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ <sys:hidden-classes/>
+ <sys:non-overridable-classes/>
+ </sys:environment>
+
+ <context-root>/demo</context-root>
+
+ <security-realm-name>demo-properties-realm</security-realm-name>
+
+ <sec:security>
+ <sec:default-principal>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="izumi"/>
+ </sec:default-principal>
+ <sec:role-mappings>
+ <sec:role role-name="content-administrator">
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="it" designated-run-as="true"/>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="metro"/>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="george"/>
+ </sec:role>
+ </sec:role-mappings>
+ </sec:security>
+
+ <gbean name="demo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <attribute name="realmName">demo-properties-realm</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <xml-reference name="LoginModuleConfiguration">
+ <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
+ <log:login-module control-flag="REQUIRED" wrap-principals="false">
+ <log:login-domain-name>demo-properties-realm</log:login-domain-name>
+ <log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
+ <log:option name="usersURI">var/security/demo_users.properties</log:option>
+ <log:option name="groupsURI">var/security/demo_groups.properties</log:option>
+ </log:login-module>
+ </log:login-config>
+ </xml-reference>
+ </gbean>
+
+</web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml Thu Nov 17 02:19:12 2011
@@ -1,70 +1,70 @@
-<?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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>org.apache.geronimo.testsuite</sys:groupId>
- <sys:artifactId>test-security</sys:artifactId>
- <sys:version>2.2-SNAPSHOT</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/demo</context-root>
-
- <security-realm-name>demo-properties-realm</security-realm-name>
-
- <sec:security>
- <sec:default-principal>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="izumi"/>
- </sec:default-principal>
- <sec:role-mappings>
- <sec:role role-name="content-administrator">
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="it" designated-run-as="true"/>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="metro"/>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="george"/>
- </sec:role>
- </sec:role-mappings>
- </sec:security>
-
- <gbean name="demo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <attribute name="realmName">demo-properties-realm</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <xml-reference name="LoginModuleConfiguration">
- <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
- <log:login-module control-flag="REQUIRED" wrap-principals="false">
- <log:login-domain-name>demo-properties-realm</log:login-domain-name>
- <log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
- <log:option name="usersURI">var/security/demo_users.properties</log:option>
- <log:option name="groupsURI">var/security/demo_groups.properties</log:option>
- </log:login-module>
- </log:login-config>
- </xml-reference>
- </gbean>
-
-</web-app>
+<?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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>org.apache.geronimo.testsuite</sys:groupId>
+ <sys:artifactId>test-security</sys:artifactId>
+ <sys:version>2.2-SNAPSHOT</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ <sys:hidden-classes/>
+ <sys:non-overridable-classes/>
+ </sys:environment>
+
+ <context-root>/demo</context-root>
+
+ <security-realm-name>demo-properties-realm</security-realm-name>
+
+ <sec:security>
+ <sec:default-principal>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="izumi"/>
+ </sec:default-principal>
+ <sec:role-mappings>
+ <sec:role role-name="content-administrator">
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="it" designated-run-as="true"/>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="metro"/>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="george"/>
+ </sec:role>
+ </sec:role-mappings>
+ </sec:security>
+
+ <gbean name="demo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <attribute name="realmName">demo-properties-realm</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <xml-reference name="LoginModuleConfiguration">
+ <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
+ <log:login-module control-flag="REQUIRED" wrap-principals="false">
+ <log:login-domain-name>demo-properties-realm</log:login-domain-name>
+ <log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
+ <log:option name="usersURI">var/security/demo_users.properties</log:option>
+ <log:option name="groupsURI">var/security/demo_groups.properties</log:option>
+ </log:login-module>
+ </log:login-config>
+ </xml-reference>
+ </gbean>
+
+</web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml Thu Nov 17 02:19:12 2011
@@ -1,47 +1,47 @@
-<?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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>jaxws-calculator</dep:groupId>
- <dep:artifactId>calculator</dep:artifactId>
- <dep:version>2.1</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/jaxws-calculator</context-root>
-
- <naming:service-ref>
- <naming:service-ref-name>services/Calculator</naming:service-ref-name>
- <naming:port>
- <naming:port-name>CalculatorPort</naming:port-name>
- <naming:protocol>http</naming:protocol>
- <naming:host>localhost</naming:host>
- <naming:port>8080</naming:port>
- <naming:uri>/jaxws-calculator/calculator</naming:uri>
- </naming:port>
- </naming:service-ref>
-
-</web-app>
+<?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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>jaxws-calculator</dep:groupId>
+ <dep:artifactId>calculator</dep:artifactId>
+ <dep:version>2.1</dep:version>
+ <dep:type>war</dep:type>
+ </dep:moduleId>
+ </dep:environment>
+
+ <context-root>/jaxws-calculator</context-root>
+
+ <naming:service-ref>
+ <naming:service-ref-name>services/Calculator</naming:service-ref-name>
+ <naming:port>
+ <naming:port-name>CalculatorPort</naming:port-name>
+ <naming:protocol>http</naming:protocol>
+ <naming:host>localhost</naming:host>
+ <naming:port>8080</naming:port>
+ <naming:uri>/jaxws-calculator/calculator</naming:uri>
+ </naming:port>
+ </naming:service-ref>
+
+</web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-5.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml Thu Nov 17 02:19:12 2011
@@ -1,57 +1,57 @@
-<?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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
- <dep:artifactId>geronimo-remote-deploy</dep:artifactId>
- <dep:version>2.2-SNAPSHOT</dep:version>
- </dep:moduleId>
- <dep:dependencies/>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
-
- <context-root>/remote-deploy</context-root>
-
- <context-priority-classloader>true</context-priority-classloader>
-
- <security-realm-name>geronimo-admin</security-realm-name>
-
- <sec:security>
- <sec:default-principal>
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
- name="anonymous"/>
- </sec:default-principal>
- <sec:role-mappings>
- <sec:role role-name="admin">
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
- name="admin" designated-run-as="true"/>
- </sec:role>
- </sec:role-mappings>
- </sec:security>
-
- <dep:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean" />
-
-</web-app>
+<?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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
+ <dep:artifactId>geronimo-remote-deploy</dep:artifactId>
+ <dep:version>2.2-SNAPSHOT</dep:version>
+ </dep:moduleId>
+ <dep:dependencies/>
+ <dep:hidden-classes/>
+ <dep:non-overridable-classes/>
+ </dep:environment>
+
+ <context-root>/remote-deploy</context-root>
+
+ <context-priority-classloader>true</context-priority-classloader>
+
+ <security-realm-name>geronimo-admin</security-realm-name>
+
+ <sec:security>
+ <sec:default-principal>
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
+ name="anonymous"/>
+ </sec:default-principal>
+ <sec:role-mappings>
+ <sec:role role-name="admin">
+ <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+ name="admin" designated-run-as="true"/>
+ </sec:role>
+ </sec:role-mappings>
+ </sec:security>
+
+ <dep:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean" />
+
+</web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-example-6.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml Thu Nov 17 02:19:12 2011
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <environment>
- <moduleId>
- <groupId>jaxws-calculator</groupId>
- <artifactId>calculator</artifactId>
- <version>2.1</version>
- <type>war</type>
- </moduleId>
- </environment>
- <ns8:context-root>/jaxws-calculator</ns8:context-root>
- <ns3:service-ref>
- <ns3:service-ref-name>services/Calculator</ns3:service-ref-name>
- <ns3:port>
- <ns3:port-name>CalculatorPort</ns3:port-name>
- <ns3:protocol>http</ns3:protocol>
- <ns3:host>localhost</ns3:host>
- <ns3:port>8080</ns3:port>
- <ns3:uri>/jaxws-calculator/calculator</ns3:uri>
- </ns3:port>
- </ns3:service-ref>
-</ns8:web-app>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+ <environment>
+ <moduleId>
+ <groupId>jaxws-calculator</groupId>
+ <artifactId>calculator</artifactId>
+ <version>2.1</version>
+ <type>war</type>
+ </moduleId>
+ </environment>
+ <ns8:context-root>/jaxws-calculator</ns8:context-root>
+ <ns3:service-ref>
+ <ns3:service-ref-name>services/Calculator</ns3:service-ref-name>
+ <ns3:port>
+ <ns3:port-name>CalculatorPort</ns3:port-name>
+ <ns3:protocol>http</ns3:protocol>
+ <ns3:host>localhost</ns3:host>
+ <ns3:port>8080</ns3:port>
+ <ns3:uri>/jaxws-calculator/calculator</ns3:uri>
+ </ns3:port>
+ </ns3:service-ref>
+</ns8:web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml Thu Nov 17 02:19:12 2011
@@ -1,208 +1,208 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-
-<!-- @version $Rev: 652419 $ $Date: 2008-05-01 10:09:32 +0800 (Thu, 01 May 2008) $ -->
-
-<web:web-app xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:pers="http://java.sun.com/xml/ns/persistence">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
- <dep:artifactId>agent-ear</dep:artifactId>
- <dep:version>2.2-SNAPSHOT</dep:version>
- <dep:type>ear</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
- <dep:artifactId>agent-ds</dep:artifactId>
- <dep:version>2.2-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- </dep:environment>
- <web:context-root>contextroot</web:context-root>
- <web:work-dir>workdir</web:work-dir>
- <name:web-container>
- <name:pattern>
- <name:groupId>gbeanlocator-pattern-groupid</name:groupId>
- <name:artifactId>gbeanlocator-pattern-artifactid</name:artifactId>
- <name:version>gbeanlocator-pattern-version</name:version>
- <name:module>gbeanlocator-pattern-module</name:module>
- <name:name>gbeanlocator-pattern-name</name:name>
- </name:pattern>
- <name:gbean-link>gbeanlocator-gbeanlink</name:gbean-link>
- </name:web-container>
- <name:abstract-naming-entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="name:persistence-unit-refType">
- <name:persistence-unit-ref-name>persistenceunitref-unitrefname</name:persistence-unit-ref-name>
- <name:persistence-unit-name>persistenceunitref-unitname</name:persistence-unit-name>
- <name:pattern>
- <name:groupId>persistenceunitref-pattern-groupid</name:groupId>
- <name:artifactId>persistenceunitref-pattern-artifactid</name:artifactId>
- <name:version>persistenceunitref-pattern-version</name:version>
- <name:module>persistenceunitref-pattern-module</name:module>
- <name:name>persistenceunitref-pattern-name</name:name>
- </name:pattern>
- </name:abstract-naming-entry>
- <name:ejb-ref>
- <name:ref-name>ejbref-refname</name:ref-name>
- <name:pattern>
- <name:groupId>ejbref-pattern-groupid</name:groupId>
- <name:artifactId>ejbref-pattern-artifactid</name:artifactId>
- <name:version>ejbref-pattern-version</name:version>
- <name:module>ejbref-pattern-module</name:module>
- <name:name>ejbref-pattern-name</name:name>
- </name:pattern>
- <name:ns-corbaloc>ejbref-nscorbaloc</name:ns-corbaloc>
- <name:name>ejbref-name</name:name>
- <name:css>
- <name:groupId>ejbref-css-groupid</name:groupId>
- <name:artifactId>ejbref-css-artifactid</name:artifactId>
- <name:version>ejbref-css-version</name:version>
- <name:module>ejbref-css-module</name:module>
- <name:name>ejbref-css-name</name:name>
- </name:css>
- <name:css-link>ejbref-csslink</name:css-link>
- <name:ejb-link>ejbref-ejblink</name:ejb-link>
- </name:ejb-ref>
- <name:ejb-local-ref>
- <name:ref-name>ejblocalref-refname</name:ref-name>
- <name:pattern>
- <name:groupId>ejblocalref-pattern-groupid</name:groupId>
- <name:artifactId>ejblocalref-pattern-artifactid</name:artifactId>
- <name:version>ejblocalref-pattern-version</name:version>
- <name:module>ejblocalref-pattern-module</name:module>
- <name:name>ejblocalref-pattern-name</name:name>
- </name:pattern>
- <name:ejb-link>ejblocalref-ejblink</name:ejb-link>
- </name:ejb-local-ref>
- <name:service-ref>
- <name:service-ref-name>serviceref-refname</name:service-ref-name>
- <name:service-completion>
- <name:service-name>serviceref-servicecompletion-servicename</name:service-name>
- <name:port-completion>
- <name:port>
- <name:port-name>serviceref-servicecompletion-portcompletion-port-portname</name:port-name>
- <name:protocol>serviceref-servicecompletion-portcompletion-port-protocol</name:protocol>
- <name:host>serviceref-servicecompletion-portcompletion-port-host</name:host>
- <name:port>0</name:port>
- <name:uri>serviceref-servicecompletion-portcompletion-port-uri</name:uri>
- <name:credentials-name>serviceref-servicecompletion-portcompletion-port-credentialsname</name:credentials-name>
- </name:port>
- <name:binding-name>serviceref-servicecompletion-portcompletion-bindingname</name:binding-name>
- </name:port-completion>
- </name:service-completion>
- <name:port>
- <name:port-name>serviceref-port-portname</name:port-name>
- <name:protocol>serviceref-port-protocol</name:protocol>
- <name:host>serviceref-port-host</name:host>
- <name:port>0</name:port>
- <name:uri>serviceref-port-uri</name:uri>
- <name:credentials-name>serviceref-port-credentialsname</name:credentials-name>
- </name:port>
- </name:service-ref>
- <name:resource-ref>
- <name:ref-name>resourceref-refname</name:ref-name>
- <name:pattern>
- <name:groupId>resourceref-pattern-groupid</name:groupId>
- <name:artifactId>resourceref-pattern-artifactid</name:artifactId>
- <name:version>resourceref-pattern-version</name:version>
- <name:module>resourcref-pattern-module</name:module>
- <name:name>resourceref-pattern-name</name:name>
- </name:pattern>
- <name:resource-link>resourceref-resourcelink</name:resource-link>
- <name:url>resourceref-url</name:url>
- </name:resource-ref>
- <name:resource-env-ref>
- <name:ref-name>resourceenvref-refname</name:ref-name>
- <name:pattern>
- <name:groupId>resourceenvref-pattern-groupid</name:groupId>
- <name:artifactId>resourceenvref-pattern-artifactid</name:artifactId>
- <name:version>resourceenvref-pattern-version</name:version>
- <name:module>resourceenvref-pattern-module</name:module>
- <name:name>resourceenvref-pattern-name</name:name>
- </name:pattern>
- <name:message-destination-link>resourceenvref-messagedestinationlink</name:message-destination-link>
- <name:admin-object-module>resourceenvref-adminobjectmodule</name:admin-object-module>
- <name:admin-object-link>resourceenvref-adminobjectlink</name:admin-object-link>
- </name:resource-env-ref>
- <name:message-destination>
- <name:message-destination-name>messagedestination-name</name:message-destination-name>
- <name:pattern>
- <name:groupId>messagedestination-pattern-groupid</name:groupId>
- <name:artifactId>messagedestination-pattern-artifactid</name:artifactId>
- <name:version>messagedestination-pattern-version</name:version>
- <name:module>messagedestination-pattern-module</name:module>
- <name:name>messagedestination-pattern-name</name:name>
- </name:pattern>
- <name:admin-object-module>messagedestination-adminobjectmodule</name:admin-object-module>
- <name:admin-object-link>messagedestination-adminobjectlink</name:admin-object-link>
- </name:message-destination>
- <web:security-realm-name>securityrealmname</web:security-realm-name>
- <sec:security use-context-handler="true" doas-current-caller="true" default-role="security-role">
- <sec:credential-store-ref>
- <dep:groupId>security-credentialstoreref-groupid</dep:groupId>
- <dep:artifactId>security-credentialstoreref-artifactid</dep:artifactId>
- <dep:version>security-credentialstoreref-version</dep:version>
- <dep:module>security-credentialstoreref-module</dep:module>
- <dep:type>security-credentialstoreref-type</dep:type>
- <dep:name>security-credentialstoreref-customfoo</dep:name>
- </sec:credential-store-ref>
- <sec:default-subject>
- <sec:description>security-subjectinfo-description</sec:description>
- <sec:realm>security-subjectinfo-realm</sec:realm>
- <sec:id>security-subjectinfo-id</sec:id>
- </sec:default-subject>
- <sec:role-mappings>
- <sec:role role-name="security-role">
- <sec:description>security-role-description</sec:description>
- <sec:run-as-subject>
- <sec:description>security-role-subjectinfo-description</sec:description>
- <sec:realm>security-role-subjectinfo-realm</sec:realm>
- <sec:id>security-role-subjectinfo-id</sec:id>
- </sec:run-as-subject>
- <sec:realm-principal name="security-role-realmprincipal-name" class="security-role-realmprincipal-class">
- <sec:description>security-role-realmprincipal-description</sec:description>
- </sec:realm-principal>
- <sec:login-domain-principal domain-name="security-role-logindomainprincipal-domainname" name="security-role-logindomainprincipal-name" class="security-role-logindomainprincipal-class">
- <sec:description>security-role-logindomainprincipal-description</sec:description>
- </sec:login-domain-principal>
- <sec:principal name="security-role-principal-name" class="security-role-principal-class">
- <sec:description>security-role-principal-description</sec:description>
- </sec:principal>
- <sec:distinguished-name name="security-role-distinguishedname">
- <sec:description>security-role-distinguished-name-description</sec:description>
- </sec:distinguished-name>
- </sec:role>
- </sec:role-mappings>
- </sec:security>
- <pers:persistence version="persistence-version">
- <pers:persistence-unit transaction-type="RESOURCE_LOCAL" name="persistence-name">
- <pers:description>persistence-description</pers:description>
- <pers:provider>persistence-provider</pers:provider>
- <pers:jta-data-source>persistence-jtadatasource</pers:jta-data-source>
- <pers:non-jta-data-source>persistence-nonjtadatasource</pers:non-jta-data-source>
- <pers:mapping-file>persistence-mappingfile</pers:mapping-file>
- <pers:jar-file>persistence-jarfile</pers:jar-file>
- <pers:class>persistence-clazz</pers:class>
- <pers:exclude-unlisted-classes>true</pers:exclude-unlisted-classes>
- <pers:properties>
- <pers:property value="persistence-property-value" name="persistence-property-name"/>
- </pers:properties>
- </pers:persistence-unit>
- </pers:persistence>
-</web:web-app>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<web:web-app xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:pers="http://java.sun.com/xml/ns/persistence">
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+ <dep:artifactId>agent-ear</dep:artifactId>
+ <dep:version>2.2-SNAPSHOT</dep:version>
+ <dep:type>ear</dep:type>
+ </dep:moduleId>
+ <dep:dependencies>
+ <dep:dependency>
+ <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+ <dep:artifactId>agent-ds</dep:artifactId>
+ <dep:version>2.2-SNAPSHOT</dep:version>
+ <dep:type>car</dep:type>
+ </dep:dependency>
+ </dep:dependencies>
+ </dep:environment>
+ <web:context-root>contextroot</web:context-root>
+ <web:work-dir>workdir</web:work-dir>
+ <name:web-container>
+ <name:pattern>
+ <name:groupId>gbeanlocator-pattern-groupid</name:groupId>
+ <name:artifactId>gbeanlocator-pattern-artifactid</name:artifactId>
+ <name:version>gbeanlocator-pattern-version</name:version>
+ <name:module>gbeanlocator-pattern-module</name:module>
+ <name:name>gbeanlocator-pattern-name</name:name>
+ </name:pattern>
+ <name:gbean-link>gbeanlocator-gbeanlink</name:gbean-link>
+ </name:web-container>
+ <name:abstract-naming-entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="name:persistence-unit-refType">
+ <name:persistence-unit-ref-name>persistenceunitref-unitrefname</name:persistence-unit-ref-name>
+ <name:persistence-unit-name>persistenceunitref-unitname</name:persistence-unit-name>
+ <name:pattern>
+ <name:groupId>persistenceunitref-pattern-groupid</name:groupId>
+ <name:artifactId>persistenceunitref-pattern-artifactid</name:artifactId>
+ <name:version>persistenceunitref-pattern-version</name:version>
+ <name:module>persistenceunitref-pattern-module</name:module>
+ <name:name>persistenceunitref-pattern-name</name:name>
+ </name:pattern>
+ </name:abstract-naming-entry>
+ <name:ejb-ref>
+ <name:ref-name>ejbref-refname</name:ref-name>
+ <name:pattern>
+ <name:groupId>ejbref-pattern-groupid</name:groupId>
+ <name:artifactId>ejbref-pattern-artifactid</name:artifactId>
+ <name:version>ejbref-pattern-version</name:version>
+ <name:module>ejbref-pattern-module</name:module>
+ <name:name>ejbref-pattern-name</name:name>
+ </name:pattern>
+ <name:ns-corbaloc>ejbref-nscorbaloc</name:ns-corbaloc>
+ <name:name>ejbref-name</name:name>
+ <name:css>
+ <name:groupId>ejbref-css-groupid</name:groupId>
+ <name:artifactId>ejbref-css-artifactid</name:artifactId>
+ <name:version>ejbref-css-version</name:version>
+ <name:module>ejbref-css-module</name:module>
+ <name:name>ejbref-css-name</name:name>
+ </name:css>
+ <name:css-link>ejbref-csslink</name:css-link>
+ <name:ejb-link>ejbref-ejblink</name:ejb-link>
+ </name:ejb-ref>
+ <name:ejb-local-ref>
+ <name:ref-name>ejblocalref-refname</name:ref-name>
+ <name:pattern>
+ <name:groupId>ejblocalref-pattern-groupid</name:groupId>
+ <name:artifactId>ejblocalref-pattern-artifactid</name:artifactId>
+ <name:version>ejblocalref-pattern-version</name:version>
+ <name:module>ejblocalref-pattern-module</name:module>
+ <name:name>ejblocalref-pattern-name</name:name>
+ </name:pattern>
+ <name:ejb-link>ejblocalref-ejblink</name:ejb-link>
+ </name:ejb-local-ref>
+ <name:service-ref>
+ <name:service-ref-name>serviceref-refname</name:service-ref-name>
+ <name:service-completion>
+ <name:service-name>serviceref-servicecompletion-servicename</name:service-name>
+ <name:port-completion>
+ <name:port>
+ <name:port-name>serviceref-servicecompletion-portcompletion-port-portname</name:port-name>
+ <name:protocol>serviceref-servicecompletion-portcompletion-port-protocol</name:protocol>
+ <name:host>serviceref-servicecompletion-portcompletion-port-host</name:host>
+ <name:port>0</name:port>
+ <name:uri>serviceref-servicecompletion-portcompletion-port-uri</name:uri>
+ <name:credentials-name>serviceref-servicecompletion-portcompletion-port-credentialsname</name:credentials-name>
+ </name:port>
+ <name:binding-name>serviceref-servicecompletion-portcompletion-bindingname</name:binding-name>
+ </name:port-completion>
+ </name:service-completion>
+ <name:port>
+ <name:port-name>serviceref-port-portname</name:port-name>
+ <name:protocol>serviceref-port-protocol</name:protocol>
+ <name:host>serviceref-port-host</name:host>
+ <name:port>0</name:port>
+ <name:uri>serviceref-port-uri</name:uri>
+ <name:credentials-name>serviceref-port-credentialsname</name:credentials-name>
+ </name:port>
+ </name:service-ref>
+ <name:resource-ref>
+ <name:ref-name>resourceref-refname</name:ref-name>
+ <name:pattern>
+ <name:groupId>resourceref-pattern-groupid</name:groupId>
+ <name:artifactId>resourceref-pattern-artifactid</name:artifactId>
+ <name:version>resourceref-pattern-version</name:version>
+ <name:module>resourcref-pattern-module</name:module>
+ <name:name>resourceref-pattern-name</name:name>
+ </name:pattern>
+ <name:resource-link>resourceref-resourcelink</name:resource-link>
+ <name:url>resourceref-url</name:url>
+ </name:resource-ref>
+ <name:resource-env-ref>
+ <name:ref-name>resourceenvref-refname</name:ref-name>
+ <name:pattern>
+ <name:groupId>resourceenvref-pattern-groupid</name:groupId>
+ <name:artifactId>resourceenvref-pattern-artifactid</name:artifactId>
+ <name:version>resourceenvref-pattern-version</name:version>
+ <name:module>resourceenvref-pattern-module</name:module>
+ <name:name>resourceenvref-pattern-name</name:name>
+ </name:pattern>
+ <name:message-destination-link>resourceenvref-messagedestinationlink</name:message-destination-link>
+ <name:admin-object-module>resourceenvref-adminobjectmodule</name:admin-object-module>
+ <name:admin-object-link>resourceenvref-adminobjectlink</name:admin-object-link>
+ </name:resource-env-ref>
+ <name:message-destination>
+ <name:message-destination-name>messagedestination-name</name:message-destination-name>
+ <name:pattern>
+ <name:groupId>messagedestination-pattern-groupid</name:groupId>
+ <name:artifactId>messagedestination-pattern-artifactid</name:artifactId>
+ <name:version>messagedestination-pattern-version</name:version>
+ <name:module>messagedestination-pattern-module</name:module>
+ <name:name>messagedestination-pattern-name</name:name>
+ </name:pattern>
+ <name:admin-object-module>messagedestination-adminobjectmodule</name:admin-object-module>
+ <name:admin-object-link>messagedestination-adminobjectlink</name:admin-object-link>
+ </name:message-destination>
+ <web:security-realm-name>securityrealmname</web:security-realm-name>
+ <sec:security use-context-handler="true" doas-current-caller="true" default-role="security-role">
+ <sec:credential-store-ref>
+ <dep:groupId>security-credentialstoreref-groupid</dep:groupId>
+ <dep:artifactId>security-credentialstoreref-artifactid</dep:artifactId>
+ <dep:version>security-credentialstoreref-version</dep:version>
+ <dep:module>security-credentialstoreref-module</dep:module>
+ <dep:type>security-credentialstoreref-type</dep:type>
+ <dep:name>security-credentialstoreref-customfoo</dep:name>
+ </sec:credential-store-ref>
+ <sec:default-subject>
+ <sec:description>security-subjectinfo-description</sec:description>
+ <sec:realm>security-subjectinfo-realm</sec:realm>
+ <sec:id>security-subjectinfo-id</sec:id>
+ </sec:default-subject>
+ <sec:role-mappings>
+ <sec:role role-name="security-role">
+ <sec:description>security-role-description</sec:description>
+ <sec:run-as-subject>
+ <sec:description>security-role-subjectinfo-description</sec:description>
+ <sec:realm>security-role-subjectinfo-realm</sec:realm>
+ <sec:id>security-role-subjectinfo-id</sec:id>
+ </sec:run-as-subject>
+ <sec:realm-principal name="security-role-realmprincipal-name" class="security-role-realmprincipal-class">
+ <sec:description>security-role-realmprincipal-description</sec:description>
+ </sec:realm-principal>
+ <sec:login-domain-principal domain-name="security-role-logindomainprincipal-domainname" name="security-role-logindomainprincipal-name" class="security-role-logindomainprincipal-class">
+ <sec:description>security-role-logindomainprincipal-description</sec:description>
+ </sec:login-domain-principal>
+ <sec:principal name="security-role-principal-name" class="security-role-principal-class">
+ <sec:description>security-role-principal-description</sec:description>
+ </sec:principal>
+ <sec:distinguished-name name="security-role-distinguishedname">
+ <sec:description>security-role-distinguished-name-description</sec:description>
+ </sec:distinguished-name>
+ </sec:role>
+ </sec:role-mappings>
+ </sec:security>
+ <pers:persistence version="persistence-version">
+ <pers:persistence-unit transaction-type="RESOURCE_LOCAL" name="persistence-name">
+ <pers:description>persistence-description</pers:description>
+ <pers:provider>persistence-provider</pers:provider>
+ <pers:jta-data-source>persistence-jtadatasource</pers:jta-data-source>
+ <pers:non-jta-data-source>persistence-nonjtadatasource</pers:non-jta-data-source>
+ <pers:mapping-file>persistence-mappingfile</pers:mapping-file>
+ <pers:jar-file>persistence-jarfile</pers:jar-file>
+ <pers:class>persistence-clazz</pers:class>
+ <pers:exclude-unlisted-classes>true</pers:exclude-unlisted-classes>
+ <pers:properties>
+ <pers:property value="persistence-property-value" name="persistence-property-name"/>
+ </pers:properties>
+ </pers:persistence-unit>
+ </pers:persistence>
+</web:web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml Thu Nov 17 02:19:12 2011
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <environment>
- <moduleId>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-remote-deploy</artifactId>
- <version>2.2-SNAPSHOT</version>
- </moduleId>
- <dependencies/>
- <hidden-classes/>
- <non-overridable-classes/>
- </environment>
- <ns8:context-root>/remote-deploy</ns8:context-root>
- <ns8:security-realm-name>geronimo-admin</ns8:security-realm-name>
- <ns6:security>
- <ns6:role-mappings>
- <ns6:role role-name="admin">
- <ns6:principal name="admin" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
- </ns6:role>
- </ns6:role-mappings>
- </ns6:security>
- <gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
-</ns8:web-app>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-remote-deploy</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </moduleId>
+ <dependencies/>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+ <ns8:context-root>/remote-deploy</ns8:context-root>
+ <ns8:security-realm-name>geronimo-admin</ns8:security-realm-name>
+ <ns6:security>
+ <ns6:role-mappings>
+ <ns6:role role-name="admin">
+ <ns6:principal name="admin" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+ </ns6:role>
+ </ns6:role-mappings>
+ </ns6:security>
+ <gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
+</ns8:web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml Thu Nov 17 02:19:12 2011
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <environment>
- <moduleId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-security</artifactId>
- <version>2.2-SNAPSHOT</version>
- <type>war</type>
- </moduleId>
- <hidden-classes/>
- <non-overridable-classes/>
- </environment>
- <ns8:context-root>/demo</ns8:context-root>
- <ns8:security-realm-name>demo-properties-realm</ns8:security-realm-name>
- <ns6:security>
- <ns6:role-mappings>
- <ns6:role role-name="content-administrator">
- <ns6:principal name="it" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
- <ns6:principal name="metro" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
- <ns6:principal name="george" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
- </ns6:role>
- </ns6:role-mappings>
- </ns6:security>
-</ns8:web-app>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>test-security</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>war</type>
+ </moduleId>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+ <ns8:context-root>/demo</ns8:context-root>
+ <ns8:security-realm-name>demo-properties-realm</ns8:security-realm-name>
+ <ns6:security>
+ <ns6:role-mappings>
+ <ns6:role role-name="content-administrator">
+ <ns6:principal name="it" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+ <ns6:principal name="metro" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+ <ns6:principal name="george" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+ </ns6:role>
+ </ns6:role-mappings>
+ </ns6:security>
+</ns8:web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml Thu Nov 17 02:19:12 2011
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <environment>
- <moduleId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-security</artifactId>
- <version>2.2-SNAPSHOT</version>
- <type>war</type>
- </moduleId>
- <hidden-classes/>
- <non-overridable-classes/>
- </environment>
- <ns8:context-root>/demo</ns8:context-root>
- <ns8:security-realm-name>demo-properties-realm</ns8:security-realm-name>
- <ns6:security>
- <ns6:role-mappings>
- <ns6:role role-name="content-administrator">
- <ns6:principal name="it" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
- <ns6:principal name="metro" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
- <ns6:principal name="george" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
- </ns6:role>
- </ns6:role-mappings>
- </ns6:security>
-</ns8:web-app>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>test-security</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>war</type>
+ </moduleId>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+ <ns8:context-root>/demo</ns8:context-root>
+ <ns8:security-realm-name>demo-properties-realm</ns8:security-realm-name>
+ <ns6:security>
+ <ns6:role-mappings>
+ <ns6:role role-name="content-administrator">
+ <ns6:principal name="it" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+ <ns6:principal name="metro" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+ <ns6:principal name="george" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+ </ns6:role>
+ </ns6:role-mappings>
+ </ns6:security>
+</ns8:web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml Thu Nov 17 02:19:12 2011
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-
-<!-- @version $Rev: 647891 $ $Date: 2008-04-15 00:40:39 +0800 (Tue, 15 Apr 2008) $ -->
-
-<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <environment>
- <moduleId>
- <groupId>jaxws-calculator</groupId>
- <artifactId>calculator</artifactId>
- <version>2.1</version>
- <type>war</type>
- </moduleId>
- </environment>
- <ns8:context-root>/jaxws-calculator</ns8:context-root>
- <ns3:service-ref>
- <ns3:service-ref-name>services/Calculator</ns3:service-ref-name>
- <ns3:port>
- <ns3:port-name>CalculatorPort</ns3:port-name>
- <ns3:protocol>http</ns3:protocol>
- <ns3:host>localhost</ns3:host>
- <ns3:port>8080</ns3:port>
- <ns3:uri>/jaxws-calculator/calculator</ns3:uri>
- </ns3:port>
- </ns3:service-ref>
-</ns8:web-app>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<ns8:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+ <environment>
+ <moduleId>
+ <groupId>jaxws-calculator</groupId>
+ <artifactId>calculator</artifactId>
+ <version>2.1</version>
+ <type>war</type>
+ </moduleId>
+ </environment>
+ <ns8:context-root>/jaxws-calculator</ns8:context-root>
+ <ns3:service-ref>
+ <ns3:service-ref-name>services/Calculator</ns3:service-ref-name>
+ <ns3:port>
+ <ns3:port-name>CalculatorPort</ns3:port-name>
+ <ns3:protocol>http</ns3:protocol>
+ <ns3:host>localhost</ns3:host>
+ <ns3:port>8080</ns3:port>
+ <ns3:uri>/jaxws-calculator/calculator</ns3:uri>
+ </ns3:port>
+ </ns3:service-ref>
+</ns8:web-app>
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/web/geronimo-web-expected-5.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml