You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/09/22 11:54:57 UTC
svn commit: r999851 - in /harmony/enhanced/java/branches/java6:
classlib/modules/luni/src/main/java/java/io/
classlib/modules/luni/src/main/java/java/net/
classlib/modules/luni/src/main/java/java/util/
classlib/modules/luni/src/main/java/java/util/spi/...
Author: hindessm
Date: Wed Sep 22 09:54:56 2010
New Revision: 999851
URL: http://svn.apache.org/viewvc?rev=999851&view=rev
Log:
Add missing svn:eol-style properties. Thanks to Robert Muir for the
reminder that this needs doing occasionally.
Modified:
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/IOError.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/IDN.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/NavigableMap.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/NavigableSet.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/CurrencyNameProvider.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleNameProvider.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleServiceProvider.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/TimeZoneNameProvider.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOErrorTest.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/IDNTest.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleEntryTest.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleImmutableEntryTest.java (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/PolicySpi.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/URIParameter.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicyProvider.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicySpiImpl.java (contents, props changed)
harmony/enhanced/java/branches/java6/classlib/modules/x-tools/META-INF/MANIFEST.MF (contents, props changed)
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java (props changed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/IOError.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/IDN.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/NavigableMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/NavigableSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/CurrencyNameProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/CurrencyNameProvider.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/CurrencyNameProvider.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/CurrencyNameProvider.java Wed Sep 22 09:54:56 2010
@@ -1,54 +1,54 @@
-/*
- * 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.
- */
-
-package java.util.spi;
-
-import java.util.Locale;
-
-/**
- * CurrencyNameProvider is an abstract class to get localized currency symbols
- * from service providers.
- *
- * @since 1.6
- *
- */
-public abstract class CurrencyNameProvider extends LocaleServiceProvider {
-
- /**
- * The constructor
- *
- */
- protected CurrencyNameProvider() {
- // do nothing
- }
-
- /**
- * Returns the symbol for the specified currency
- *
- * @param code
- * the code of the specified currency in "ISO 4217"
- * @param locale
- * the locale
- * @return the symbol or null if there is no available symbol in the locale
- * @throws NullPointerException
- * if code or locale is null
- * @throws IllegalArgumentException
- * if code or locale is not in a legal format or not available
- */
- public abstract String getSymbol(String code, Locale locale);
-
-}
+/*
+ * 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.
+ */
+
+package java.util.spi;
+
+import java.util.Locale;
+
+/**
+ * CurrencyNameProvider is an abstract class to get localized currency symbols
+ * from service providers.
+ *
+ * @since 1.6
+ *
+ */
+public abstract class CurrencyNameProvider extends LocaleServiceProvider {
+
+ /**
+ * The constructor
+ *
+ */
+ protected CurrencyNameProvider() {
+ // do nothing
+ }
+
+ /**
+ * Returns the symbol for the specified currency
+ *
+ * @param code
+ * the code of the specified currency in "ISO 4217"
+ * @param locale
+ * the locale
+ * @return the symbol or null if there is no available symbol in the locale
+ * @throws NullPointerException
+ * if code or locale is null
+ * @throws IllegalArgumentException
+ * if code or locale is not in a legal format or not available
+ */
+ public abstract String getSymbol(String code, Locale locale);
+
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/CurrencyNameProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleNameProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleNameProvider.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleNameProvider.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleNameProvider.java Wed Sep 22 09:54:56 2010
@@ -1,86 +1,86 @@
-/*
- * 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.
- */
-
-package java.util.spi;
-
-import java.util.Locale;
-
-/**
- * LocaleNameProvider is an abstract class to get localized names from service
- * providers.
- *
- * @since 1.6
- *
- */
-public abstract class LocaleNameProvider extends LocaleServiceProvider {
-
- /**
- * The constructor
- *
- */
- protected LocaleNameProvider() {
- // do nothing
- }
-
- /**
- * Gets the localized name for the specified language code in "ISO 639" and
- * the specified locale to display.
- *
- * @param code
- * the code of language in "ISO 639"
- * @param locale
- * the locale
- * @return the name or null if unavailable
- * @throws NullPointerException
- * if code or locale is null
- * @throws IllegalArgumentException
- * if code or locale is not in a legal format or not available
- */
- public abstract String getDisplayLanguage(String code, Locale locale);
-
- /**
- * Gets the localized name for the specified country code in "ISO 3166" and
- * the specified locale to display.
- *
- * @param code
- * the code of country in "ISO 3166"
- * @param locale
- * the locale
- * @return the name or null if unavailable
- * @throws NullPointerException
- * if code or locale is null
- * @throws IllegalArgumentException
- * if code or locale is not in a legal format or not available
- */
- public abstract String getDisplayCountry(String code, Locale locale);
-
- /**
- * Gets the localized name for the specified variant code and the specified
- * locale to display.
- *
- * @param variant
- * the variant code
- * @param locale
- * the locale
- * @return the name or null if unavailable
- * @throws NullPointerException
- * if variant code or locale is null
- * @throws IllegalArgumentException
- * if locale is not available
- */
- public abstract String getDisplayVariant(String variant, Locale locale);
-}
+/*
+ * 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.
+ */
+
+package java.util.spi;
+
+import java.util.Locale;
+
+/**
+ * LocaleNameProvider is an abstract class to get localized names from service
+ * providers.
+ *
+ * @since 1.6
+ *
+ */
+public abstract class LocaleNameProvider extends LocaleServiceProvider {
+
+ /**
+ * The constructor
+ *
+ */
+ protected LocaleNameProvider() {
+ // do nothing
+ }
+
+ /**
+ * Gets the localized name for the specified language code in "ISO 639" and
+ * the specified locale to display.
+ *
+ * @param code
+ * the code of language in "ISO 639"
+ * @param locale
+ * the locale
+ * @return the name or null if unavailable
+ * @throws NullPointerException
+ * if code or locale is null
+ * @throws IllegalArgumentException
+ * if code or locale is not in a legal format or not available
+ */
+ public abstract String getDisplayLanguage(String code, Locale locale);
+
+ /**
+ * Gets the localized name for the specified country code in "ISO 3166" and
+ * the specified locale to display.
+ *
+ * @param code
+ * the code of country in "ISO 3166"
+ * @param locale
+ * the locale
+ * @return the name or null if unavailable
+ * @throws NullPointerException
+ * if code or locale is null
+ * @throws IllegalArgumentException
+ * if code or locale is not in a legal format or not available
+ */
+ public abstract String getDisplayCountry(String code, Locale locale);
+
+ /**
+ * Gets the localized name for the specified variant code and the specified
+ * locale to display.
+ *
+ * @param variant
+ * the variant code
+ * @param locale
+ * the locale
+ * @return the name or null if unavailable
+ * @throws NullPointerException
+ * if variant code or locale is null
+ * @throws IllegalArgumentException
+ * if locale is not available
+ */
+ public abstract String getDisplayVariant(String variant, Locale locale);
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleNameProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleServiceProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleServiceProvider.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleServiceProvider.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleServiceProvider.java Wed Sep 22 09:54:56 2010
@@ -1,44 +1,44 @@
-/*
- * 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.
- */
-
-package java.util.spi;
-
-import java.util.Locale;
-
-/**
- * The base class for all the locale related service provider interfaces (SPIs).
- *
- * @since 1.6
- */
-public abstract class LocaleServiceProvider {
- /**
- * The constructor
- *
- */
- protected LocaleServiceProvider() {
- // do nothing
- }
-
- /**
- * Gets all available locales that has localized objects or names from this
- * locale service provider.
- *
- * @return all available locales that has localized objects or names from
- * this locale service provider
- */
- public abstract Locale[] getAvailableLocales();
-}
+/*
+ * 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.
+ */
+
+package java.util.spi;
+
+import java.util.Locale;
+
+/**
+ * The base class for all the locale related service provider interfaces (SPIs).
+ *
+ * @since 1.6
+ */
+public abstract class LocaleServiceProvider {
+ /**
+ * The constructor
+ *
+ */
+ protected LocaleServiceProvider() {
+ // do nothing
+ }
+
+ /**
+ * Gets all available locales that has localized objects or names from this
+ * locale service provider.
+ *
+ * @return all available locales that has localized objects or names from
+ * this locale service provider
+ */
+ public abstract Locale[] getAvailableLocales();
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/LocaleServiceProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/TimeZoneNameProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/TimeZoneNameProvider.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/TimeZoneNameProvider.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/TimeZoneNameProvider.java Wed Sep 22 09:54:56 2010
@@ -1,59 +1,59 @@
-/*
- * 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.
- */
-
-package java.util.spi;
-
-import java.util.Locale;
-
-/**
- * TimeZoneNameProvider is an abstract class to get localized time zone names
- * from service providers.
- *
- * @since 1.6
- *
- */
-public abstract class TimeZoneNameProvider extends LocaleServiceProvider {
-
- /**
- * The constructor
- *
- */
- protected TimeZoneNameProvider() {
- // do nothing
- }
-
- /**
- * Gets the name of the specified time zone ID that's suitable to display to
- * the user.
- *
- * @param id
- * id of time zone
- * @param daylight
- * true to return the daylight saving time.
- * @param style
- * TimeZone.LONG or TimeZone.SHORT
- * @param locale
- * the locale
- * @return the readable time zone name, or null if it is unavailable
- * @throws NullPointerException
- * if id or locale is null
- * @throws IllegalArgumentException
- * if locale is not available or style is invalid
- */
- public abstract String getDisplayName(String id, boolean daylight,
- int style, Locale locale);
-}
+/*
+ * 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.
+ */
+
+package java.util.spi;
+
+import java.util.Locale;
+
+/**
+ * TimeZoneNameProvider is an abstract class to get localized time zone names
+ * from service providers.
+ *
+ * @since 1.6
+ *
+ */
+public abstract class TimeZoneNameProvider extends LocaleServiceProvider {
+
+ /**
+ * The constructor
+ *
+ */
+ protected TimeZoneNameProvider() {
+ // do nothing
+ }
+
+ /**
+ * Gets the name of the specified time zone ID that's suitable to display to
+ * the user.
+ *
+ * @param id
+ * id of time zone
+ * @param daylight
+ * true to return the daylight saving time.
+ * @param style
+ * TimeZone.LONG or TimeZone.SHORT
+ * @param locale
+ * the locale
+ * @return the readable time zone name, or null if it is unavailable
+ * @throws NullPointerException
+ * if id or locale is null
+ * @throws IllegalArgumentException
+ * if locale is not available or style is invalid
+ */
+ public abstract String getDisplayName(String id, boolean daylight,
+ int style, Locale locale);
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/spi/TimeZoneNameProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOErrorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/IDNTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleEntryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/SimpleImmutableEntryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/PolicySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/PolicySpi.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/PolicySpi.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/PolicySpi.java Wed Sep 22 09:54:56 2010
@@ -1,112 +1,112 @@
-/*
- * 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.
- */
-
-package java.security;
-
-/**
- * Represents the Service Provider Interface (SPI) for java.security.Policy
- * class.
- *
- * If there is any class that wants to provide a Policy implementation, all
- * abstract methods in this SPI should be implemented.
- *
- * The detailed implementations should offer a public constructor, in which a
- * Policy.Paramters implementation acts as an input parameter.If the
- * Policy.Paramters input cannot by understood by the constructor, an
- * IllegalArgumentException will be thrown.
- *
- * @since 1.6
- */
-public abstract class PolicySpi {
-
- public PolicySpi() {
- // default constructor
- }
-
- /**
- * Answers if the policy has granted a Permission to a
- * ProtectionDomain.
- *
- * @param domain -
- * the domain to check.
- * @param permission -
- * check whether this permission is granted to the specified
- * domain.
- * @return - true if the permission is granted to the domain.
- *
- */
- protected abstract boolean engineImplies(ProtectionDomain domain,
- Permission permission);
-
- /**
- * Refreshes/reloads the policy configuration. The behavior of this method
- * depends on the implementation. For example, calling refresh on a
- * file-based policy will cause the file to be re-read.
- *
- * The default implementation of this method does nothing. This method
- * should be overridden if a refresh operation is supported by the policy
- * implementation.
- *
- */
- protected void engineRefresh() {
- // do nothing in default implementation
- }
-
- /**
- * Answers a PermissionCollection object containing the set of permissions
- * granted to the specified CodeSource.
- *
- * The default implementation of this method returns
- * Policy.UNSUPPORTED_EMPTY_COLLECTION object. This method can be overridden
- * if the policy implementation can return a set of permissions granted to a
- * CodeSource.
- *
- * @param codesource -
- * the CodeSource to which the returned PermissionCollection has
- * been granted.
- * @return a set of permissions granted to the specified CodeSource. If this
- * operation is supported, the returned set of permissions must be a
- * new mutable instance and it must support heterogeneous Permission
- * types. If this operation is not supported,
- * Policy.UNSUPPORTED_EMPTY_COLLECTION is returned.
- */
- protected PermissionCollection engineGetPermissions(CodeSource codesource) {
- return Policy.UNSUPPORTED_EMPTY_COLLECTION;
- }
-
- /**
- * Answers a PermissionCollection object containing the set of permissions
- * granted to the specified ProtectionDomain.
- *
- * The default implementation of this method returns
- * Policy.UNSUPPORTED_EMPTY_COLLECTION object. This method can be overridden
- * if the policy implementation can return a set of permissions granted to a
- * ProtectionDomain.
- *
- * @param domain -
- * the ProtectionDomain to which the returned
- * PermissionCollection has been granted.
- * @return a set of permissions granted to the specified ProtectionDomain.
- * If this operation is supported, the returned set of permissions
- * must be a new mutable instance and it must support heterogeneous
- * Permission types. If this operation is not supported,
- * Policy.UNSUPPORTED_EMPTY_COLLECTION is returned.
- */
- protected PermissionCollection engineGetPermissions(ProtectionDomain domain) {
- return Policy.UNSUPPORTED_EMPTY_COLLECTION;
- }
-}
+/*
+ * 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.
+ */
+
+package java.security;
+
+/**
+ * Represents the Service Provider Interface (SPI) for java.security.Policy
+ * class.
+ *
+ * If there is any class that wants to provide a Policy implementation, all
+ * abstract methods in this SPI should be implemented.
+ *
+ * The detailed implementations should offer a public constructor, in which a
+ * Policy.Paramters implementation acts as an input parameter.If the
+ * Policy.Paramters input cannot by understood by the constructor, an
+ * IllegalArgumentException will be thrown.
+ *
+ * @since 1.6
+ */
+public abstract class PolicySpi {
+
+ public PolicySpi() {
+ // default constructor
+ }
+
+ /**
+ * Answers if the policy has granted a Permission to a
+ * ProtectionDomain.
+ *
+ * @param domain -
+ * the domain to check.
+ * @param permission -
+ * check whether this permission is granted to the specified
+ * domain.
+ * @return - true if the permission is granted to the domain.
+ *
+ */
+ protected abstract boolean engineImplies(ProtectionDomain domain,
+ Permission permission);
+
+ /**
+ * Refreshes/reloads the policy configuration. The behavior of this method
+ * depends on the implementation. For example, calling refresh on a
+ * file-based policy will cause the file to be re-read.
+ *
+ * The default implementation of this method does nothing. This method
+ * should be overridden if a refresh operation is supported by the policy
+ * implementation.
+ *
+ */
+ protected void engineRefresh() {
+ // do nothing in default implementation
+ }
+
+ /**
+ * Answers a PermissionCollection object containing the set of permissions
+ * granted to the specified CodeSource.
+ *
+ * The default implementation of this method returns
+ * Policy.UNSUPPORTED_EMPTY_COLLECTION object. This method can be overridden
+ * if the policy implementation can return a set of permissions granted to a
+ * CodeSource.
+ *
+ * @param codesource -
+ * the CodeSource to which the returned PermissionCollection has
+ * been granted.
+ * @return a set of permissions granted to the specified CodeSource. If this
+ * operation is supported, the returned set of permissions must be a
+ * new mutable instance and it must support heterogeneous Permission
+ * types. If this operation is not supported,
+ * Policy.UNSUPPORTED_EMPTY_COLLECTION is returned.
+ */
+ protected PermissionCollection engineGetPermissions(CodeSource codesource) {
+ return Policy.UNSUPPORTED_EMPTY_COLLECTION;
+ }
+
+ /**
+ * Answers a PermissionCollection object containing the set of permissions
+ * granted to the specified ProtectionDomain.
+ *
+ * The default implementation of this method returns
+ * Policy.UNSUPPORTED_EMPTY_COLLECTION object. This method can be overridden
+ * if the policy implementation can return a set of permissions granted to a
+ * ProtectionDomain.
+ *
+ * @param domain -
+ * the ProtectionDomain to which the returned
+ * PermissionCollection has been granted.
+ * @return a set of permissions granted to the specified ProtectionDomain.
+ * If this operation is supported, the returned set of permissions
+ * must be a new mutable instance and it must support heterogeneous
+ * Permission types. If this operation is not supported,
+ * Policy.UNSUPPORTED_EMPTY_COLLECTION is returned.
+ */
+ protected PermissionCollection engineGetPermissions(ProtectionDomain domain) {
+ return Policy.UNSUPPORTED_EMPTY_COLLECTION;
+ }
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/PolicySpi.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/URIParameter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/URIParameter.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/URIParameter.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/URIParameter.java Wed Sep 22 09:54:56 2010
@@ -1,61 +1,61 @@
-/*
- * 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.
- */
-
-package java.security;
-
-import java.net.URI;
-import java.security.Policy;
-import javax.security.auth.login.Configuration;
-
-import org.apache.harmony.security.internal.nls.Messages;
-
-/**
- * This class includes a URI which refers to data for a PolicySpi or
- * ConfigurationSpi implementation.
- *
- * @since 1.6
- */
-public class URIParameter implements Policy.Parameters,
- Configuration.Parameters {
- private URI uri = null;
-
- /**
- * Constructs an instance with the URI pointing to data intended for
- * PolicySpi or ConfigurationSpi implementation.
- *
- * @param u -
- * the URI pointing to the data.
- *
- * @throws NullPointerException -
- * if the URI is null.
- */
- public URIParameter(URI u) {
- if (u == null) {
- throw new NullPointerException(Messages.getString("security.1A4")); //$NON-NLS-1$
- }
- uri = u;
- }
-
- /**
- * Answers the specified uri.
- *
- * @return - the uri.
- */
- public URI getURI() {
- return uri;
- }
-}
+/*
+ * 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.
+ */
+
+package java.security;
+
+import java.net.URI;
+import java.security.Policy;
+import javax.security.auth.login.Configuration;
+
+import org.apache.harmony.security.internal.nls.Messages;
+
+/**
+ * This class includes a URI which refers to data for a PolicySpi or
+ * ConfigurationSpi implementation.
+ *
+ * @since 1.6
+ */
+public class URIParameter implements Policy.Parameters,
+ Configuration.Parameters {
+ private URI uri = null;
+
+ /**
+ * Constructs an instance with the URI pointing to data intended for
+ * PolicySpi or ConfigurationSpi implementation.
+ *
+ * @param u -
+ * the URI pointing to the data.
+ *
+ * @throws NullPointerException -
+ * if the URI is null.
+ */
+ public URIParameter(URI u) {
+ if (u == null) {
+ throw new NullPointerException(Messages.getString("security.1A4")); //$NON-NLS-1$
+ }
+ uri = u;
+ }
+
+ /**
+ * Answers the specified uri.
+ *
+ * @return - the uri.
+ */
+ public URI getURI() {
+ return uri;
+ }
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/java/security/URIParameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicyProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicyProvider.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicyProvider.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicyProvider.java Wed Sep 22 09:54:56 2010
@@ -1,42 +1,42 @@
-/*
- * 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.
- */
-
-package org.apache.harmony.security.provider;
-
-import java.security.AccessController;
-import java.security.Provider;
-
-import org.apache.harmony.security.internal.nls.Messages;
-
-public class PolicyProvider extends Provider {
-
- /**
- * @serial
- */
- private static final long serialVersionUID = -5406416198792167201L;
-
- public PolicyProvider() {
- super("Policy", 1.0, Messages.getString("security.1A6")); //$NON-NLS-1$//$NON-NLS-2$
-
- AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
- public Object run() {
- put("Policy.JavaPolicy", "org.apache.harmony.security.provider.PolicySpiImpl"); //$NON-NLS-1$ //$NON-NLS-2$
- return null;
- }
- });
- }
-}
+/*
+ * 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.
+ */
+
+package org.apache.harmony.security.provider;
+
+import java.security.AccessController;
+import java.security.Provider;
+
+import org.apache.harmony.security.internal.nls.Messages;
+
+public class PolicyProvider extends Provider {
+
+ /**
+ * @serial
+ */
+ private static final long serialVersionUID = -5406416198792167201L;
+
+ public PolicyProvider() {
+ super("Policy", 1.0, Messages.getString("security.1A6")); //$NON-NLS-1$//$NON-NLS-2$
+
+ AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
+ public Object run() {
+ put("Policy.JavaPolicy", "org.apache.harmony.security.provider.PolicySpiImpl"); //$NON-NLS-1$ //$NON-NLS-2$
+ return null;
+ }
+ });
+ }
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicyProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicySpiImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicySpiImpl.java?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicySpiImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicySpiImpl.java Wed Sep 22 09:54:56 2010
@@ -1,70 +1,70 @@
-/*
- * 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.
- */
-
-package org.apache.harmony.security.provider;
-
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.PolicySpi;
-import java.security.ProtectionDomain;
-import java.security.URIParameter;
-
-import org.apache.harmony.security.fortress.DefaultPolicy;
-
-public class PolicySpiImpl extends PolicySpi {
- private DefaultPolicy defaultPolicy = null;
-
- private URIParameter para = null;
-
- public PolicySpiImpl() {
- defaultPolicy = new DefaultPolicy(false);
- engineRefreshImpl();
- }
-
- public PolicySpiImpl(URIParameter params) {
- defaultPolicy = new DefaultPolicy(false);
- para = params;
- engineRefreshImpl();
- }
-
- @Override
- protected boolean engineImplies(ProtectionDomain domain,
- Permission permission) {
- return defaultPolicy.implies(domain, permission);
- }
-
- @Override
- protected PermissionCollection engineGetPermissions(CodeSource codesource) {
- return defaultPolicy.getPermissions(codesource);
- }
-
- @Override
- public PermissionCollection engineGetPermissions(ProtectionDomain pd) {
- return defaultPolicy.getPermissions(pd);
- }
-
-
- @Override
- public void engineRefresh() {
- engineRefreshImpl();
- }
-
- private synchronized void engineRefreshImpl() {
- defaultPolicy.refresh(para);
- }
-}
+/*
+ * 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.
+ */
+
+package org.apache.harmony.security.provider;
+
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.PolicySpi;
+import java.security.ProtectionDomain;
+import java.security.URIParameter;
+
+import org.apache.harmony.security.fortress.DefaultPolicy;
+
+public class PolicySpiImpl extends PolicySpi {
+ private DefaultPolicy defaultPolicy = null;
+
+ private URIParameter para = null;
+
+ public PolicySpiImpl() {
+ defaultPolicy = new DefaultPolicy(false);
+ engineRefreshImpl();
+ }
+
+ public PolicySpiImpl(URIParameter params) {
+ defaultPolicy = new DefaultPolicy(false);
+ para = params;
+ engineRefreshImpl();
+ }
+
+ @Override
+ protected boolean engineImplies(ProtectionDomain domain,
+ Permission permission) {
+ return defaultPolicy.implies(domain, permission);
+ }
+
+ @Override
+ protected PermissionCollection engineGetPermissions(CodeSource codesource) {
+ return defaultPolicy.getPermissions(codesource);
+ }
+
+ @Override
+ public PermissionCollection engineGetPermissions(ProtectionDomain pd) {
+ return defaultPolicy.getPermissions(pd);
+ }
+
+
+ @Override
+ public void engineRefresh() {
+ engineRefreshImpl();
+ }
+
+ private synchronized void engineRefreshImpl() {
+ defaultPolicy.refresh(para);
+ }
+}
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/provider/PolicySpiImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/META-INF/MANIFEST.MF?rev=999851&r1=999850&r2=999851&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/META-INF/MANIFEST.MF Wed Sep 22 09:54:56 2010
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0
-Specification-Title: Java Platform API Specification
-Specification-Version: 1.6
-Implementation-Title: Apache Harmony
-Implementation-Vendor: The Apache Software Foundation
-Implementation-Vendor-Id: org.apache.harmony
-Implementation-URL: http://harmony.apache.org
-Bundle-ManifestVersion: 2
-Bundle-Name: Harmony X-Tools
-Bundle-SymbolicName: org.apache.harmony.xtools
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Eclipse-JREBundle: true
-Import-Package: java.lang,
- java.lang.reflect,
- java.security,
- java.util,
- org.apache.harmony.kernel.vm
-Export-Package: javax.tools
+Manifest-Version: 1.0
+Specification-Title: Java Platform API Specification
+Specification-Version: 1.6
+Implementation-Title: Apache Harmony
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Vendor-Id: org.apache.harmony
+Implementation-URL: http://harmony.apache.org
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony X-Tools
+Bundle-SymbolicName: org.apache.harmony.xtools
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.lang,
+ java.lang.reflect,
+ java.security,
+ java.util,
+ org.apache.harmony.kernel.vm
+Export-Package: javax.tools
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java
------------------------------------------------------------------------------
svn:eol-style = native