svn commit: r423841 - in /incubator/ofbiz/trunk/framework/security: ./ config/ data/ dtd/ entitydef/ src/org/ofbiz/security/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r423841 - in /incubator/ofbiz/trunk/framework/security: ./ config/ data/ dtd/ entitydef/ src/org/ofbiz/security/

jacopoc
Author: jacopoc
Date: Thu Jul 20 02:00:48 2006
New Revision: 423841

URL: http://svn.apache.org/viewvc?rev=423841&view=rev
Log:
License change from MIT to ASL2.0 for the files of the security component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).

Modified:
    incubator/ofbiz/trunk/framework/security/build.xml
    incubator/ofbiz/trunk/framework/security/config/security.properties
    incubator/ofbiz/trunk/framework/security/config/security.xml
    incubator/ofbiz/trunk/framework/security/data/SecurityData.xml
    incubator/ofbiz/trunk/framework/security/dtd/security-config.xsd
    incubator/ofbiz/trunk/framework/security/entitydef/entitygroup.xml
    incubator/ofbiz/trunk/framework/security/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/framework/security/ofbiz-component.xml
    incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
    incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java
    incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityConfigurationException.java
    incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java

Modified: incubator/ofbiz/trunk/framework/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/build.xml?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/build.xml (original)
+++ incubator/ofbiz/trunk/framework/security/build.xml Thu Jul 20 02:00:48 2006
@@ -1,27 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  Copyright (c) 2001 The Open For Business Project - www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *  This is the Open for Business Security Build Script.
- *  $Id: build.xml 7900 2006-06-29 05:03:20Z jonesde $
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 -->
 
 <project name="OFBiz - Security" default="jar" basedir=".">

Modified: incubator/ofbiz/trunk/framework/security/config/security.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/config/security.properties?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/config/security.properties (original)
+++ incubator/ofbiz/trunk/framework/security/config/security.properties Thu Jul 20 02:00:48 2006
@@ -1,6 +1,20 @@
+#####################################################################
+# Copyright 2001-2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#####################################################################
 ####
 # OFBiz Security Settings
-# $Id: security.properties 5178 2005-06-19 07:54:48Z jonesde $
 ####
 
 # -- define the default security context to be user

Modified: incubator/ofbiz/trunk/framework/security/config/security.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/config/security.xml?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/config/security.xml (original)
+++ incubator/ofbiz/trunk/framework/security/config/security.xml Thu Jul 20 02:00:48 2006
@@ -1,24 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  Copyright (c) 2002-2004 The Open For Business Project - www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 -->
 
 <security-config>

Modified: incubator/ofbiz/trunk/framework/security/data/SecurityData.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/data/SecurityData.xml?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/data/SecurityData.xml (original)
+++ incubator/ofbiz/trunk/framework/security/data/SecurityData.xml Thu Jul 20 02:00:48 2006
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+-->
 <entity-engine-xml>
     <!-- OFBiz Core security -->
     <!-- Target file: framework/security/data/SecurityData.xml -->

Modified: incubator/ofbiz/trunk/framework/security/dtd/security-config.xsd
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/dtd/security-config.xsd?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/dtd/security-config.xsd (original)
+++ incubator/ofbiz/trunk/framework/security/dtd/security-config.xsd Thu Jul 20 02:00:48 2006
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (c) 2002-2004 The Open For Business Project - www.ofbiz.org
-    *
-    *  Permission is hereby granted, free of charge, to any person obtaining a
-    *  copy of this software and associated documentation files (the "Software"),
-    *  to deal in the Software without restriction, including without limitation
-    *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    *  and/or sell copies of the Software, and to permit persons to whom the
-    *  Software is furnished to do so, subject to the following conditions:
-    *
-    *  The above copyright notice and this permission notice shall be included
-    *  in all copies or substantial portions of the Software.
-    *
-    *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-    *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-    *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    
-    *  This is the DTD for the Open For Business Security configuration XML file.
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:element name="security-config">

Modified: incubator/ofbiz/trunk/framework/security/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/entitydef/entitygroup.xml?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/entitydef/entitygroup.xml (original)
+++ incubator/ofbiz/trunk/framework/security/entitydef/entitygroup.xml Thu Jul 20 02:00:48 2006
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 -->
 
 <entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/ofbiz/trunk/framework/security/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/entitydef/entitymodel.xml?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/framework/security/entitydef/entitymodel.xml Thu Jul 20 02:00:48 2006
@@ -1,32 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/**
- *  Title: Entity Generator Definitions for the General Data Model
- *  Description: None
- *  Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @author     David E. Jones ([hidden email])
- * @author     Andy Zeneski ([hidden email])
- * @version    $Rev$
- */
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/ofbiz/trunk/framework/security/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/ofbiz-component.xml?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/ofbiz-component.xml (original)
+++ incubator/ofbiz/trunk/framework/security/ofbiz-component.xml Thu Jul 20 02:00:48 2006
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *  $Id: ofbiz-component.xml 5462 2005-08-05 18:35:48Z jonesde $
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 -->
 
 <ofbiz-component name="security"

Modified: incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original)
+++ incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Thu Jul 20 02:00:48 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: OFBizSecurity.java 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2001, 2002 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  */
 package org.ofbiz.security;
 

Modified: incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java (original)
+++ incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java Thu Jul 20 02:00:48 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: Security.java 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2001, 2002 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  */
 package org.ofbiz.security;
 

Modified: incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityConfigurationException.java?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityConfigurationException.java (original)
+++ incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityConfigurationException.java Thu Jul 20 02:00:48 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: SecurityConfigurationException.java 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2001, 2002 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  */
 package org.ofbiz.security;
 

Modified: incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java?rev=423841&r1=423840&r2=423841&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java (original)
+++ incubator/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java Thu Jul 20 02:00:48 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: SecurityFactory.java 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2001, 2002 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  */
 package org.ofbiz.security;