# HG changeset patch
# Parent 971fa8b08536e547c3defeccd5937f1596513243
diff --git a/keyring.fallback/build.xml b/keyring.fallback/build.xml
new file mode 100644
--- /dev/null
+++ b/keyring.fallback/build.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="netbeans" name="keyring.fallback">
+    <description>Builds, tests, and runs the project org.netbeans.modules.keyring.fallback</description>
+    <import file="../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/keyring.fallback/manifest.mf b/keyring.fallback/manifest.mf
new file mode 100644
--- /dev/null
+++ b/keyring.fallback/manifest.mf
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.netbeans.modules.keyring.fallback
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/fallback/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/keyring.fallback/nbproject/project.properties b/keyring.fallback/nbproject/project.properties
new file mode 100644
--- /dev/null
+++ b/keyring.fallback/nbproject/project.properties
@@ -0,0 +1,2 @@
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/keyring.fallback/nbproject/project.xml b/keyring.fallback/nbproject/project.xml
new file mode 100644
--- /dev/null
+++ b/keyring.fallback/nbproject/project.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.netbeans.modules.keyring.fallback</code-name-base>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.keyring</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.16</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.58</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.30</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.31</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.21</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                </test-type>
+            </test-dependencies>
+            <friend-packages>
+                <friend>org.netbeans.modules.keyring.impl</friend>
+                <package>org.netbeans.modules.keyring.spi</package>
+                <package>org.netbeans.modules.keyring.utils</package>
+            </friend-packages>
+        </data>
+    </configuration>
+</project>
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/fallback/Bundle.properties b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties
rename from keyring.impl/src/org/netbeans/modules/keyring/fallback/Bundle.properties
rename to keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties
--- a/keyring.impl/src/org/netbeans/modules/keyring/fallback/Bundle.properties
+++ b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties
@@ -1,18 +1,17 @@
+OpenIDE-Module-Display-Category=Infrastructure
+OpenIDE-Module-Name=Keyring Fallback
 FallbackProvider.sample_key.description=Sample value ensuring that decryption is working.
 FallbackProvider.msg_clear_keys=\
     Your previously stored passwords cannot be decrypted. \
     Do you wish to forget all existing passwords and start with a fresh keyring?
 FallbackProvider.title_clear_keys=Delete Stored Passwords
-MasterPasswordPanel.masterPasswordLabel.text=Master &Password:
-MasterPasswordPanel.setNewBox.text=&Change...
-MasterPasswordPanel.newLabel1.text=&New Master Password:
-MasterPasswordPanel.newLabel2.text=&Retype:
 MasterPasswordPanel.ok=OK
 MasterPasswordPanel.enter_master_password=Enter Master Password
 MasterPasswordPanel.enter_password=Enter password
 MasterPasswordPanel.enter_new_password=Enter new password
 MasterPasswordPanel.password_mismatch=New passwords do not match
-MasterPasswordPanel.explanation.text=\
-    NetBeans can remember passwords for you, but to protect them you need to enter a master password. \
-    If you have not chosen one yet, do so now; you will be prompted for it in subsequent sessions when needed. \
-    You can also change the master password whenever you are prompted for it.
+MasterPasswordPanel.setNewBox.text=&Change...
+MasterPasswordPanel.newLabel1.text=&New Master Password:
+MasterPasswordPanel.newLabel2.text=&Retype:
+MasterPasswordPanel.explanation.text=NetBeans can remember passwords for you, but to protect them you need to enter a master password. If you have not chosen one yet, do so now; you will be prompted for it in subsequent sessions when needed. You can also change the master password whenever you are prompted for it.
+MasterPasswordPanel.masterPasswordLabel.text=Master &Password:
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
rename from keyring.impl/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
rename to keyring.fallback/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
--- a/keyring.impl/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
+++ b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
@@ -52,7 +52,7 @@
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 import org.netbeans.api.keyring.Keyring;
-import org.netbeans.modules.keyring.impl.Utils;
+import org.netbeans.modules.keyring.utils.Utils;
 import org.netbeans.modules.keyring.spi.EncryptionProvider;
 import org.netbeans.spi.keyring.KeyringProvider;
 import org.openide.DialogDisplayer;
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryption.java b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryption.java
rename from keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryption.java
rename to keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryption.java
--- a/keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryption.java
+++ b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryption.java
@@ -58,7 +58,7 @@
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
 import org.netbeans.api.keyring.Keyring;
-import org.netbeans.modules.keyring.impl.Utils;
+import org.netbeans.modules.keyring.utils.Utils;
 import org.netbeans.modules.keyring.spi.EncryptionProvider;
 import org.openide.util.Mutex;
 import org.openide.util.NbPreferences;
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.form b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.form
rename from keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.form
rename to keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.form
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.java b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.java
rename from keyring.impl/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.java
rename to keyring.fallback/src/org/netbeans/modules/keyring/fallback/MasterPasswordPanel.java
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/spi/EncryptionProvider.java b/keyring.fallback/src/org/netbeans/modules/keyring/spi/EncryptionProvider.java
rename from keyring.impl/src/org/netbeans/modules/keyring/spi/EncryptionProvider.java
rename to keyring.fallback/src/org/netbeans/modules/keyring/spi/EncryptionProvider.java
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/impl/Utils.java b/keyring.fallback/src/org/netbeans/modules/keyring/utils/Utils.java
rename from keyring.impl/src/org/netbeans/modules/keyring/impl/Utils.java
rename to keyring.fallback/src/org/netbeans/modules/keyring/utils/Utils.java
--- a/keyring.impl/src/org/netbeans/modules/keyring/impl/Utils.java
+++ b/keyring.fallback/src/org/netbeans/modules/keyring/utils/Utils.java
@@ -40,7 +40,7 @@
  * Portions Copyrighted 2009 Sun Microsystems, Inc.
  */
 
-package org.netbeans.modules.keyring.impl;
+package org.netbeans.modules.keyring.utils;
 
 import java.io.File;
 import java.util.logging.Level;
diff --git a/keyring.impl/test/unit/src/org/netbeans/modules/keyring/fallback/FallbackProviderTest.java b/keyring.fallback/test/unit/src/org/netbeans/modules/keyring/fallback/FallbackProviderTest.java
rename from keyring.impl/test/unit/src/org/netbeans/modules/keyring/fallback/FallbackProviderTest.java
rename to keyring.fallback/test/unit/src/org/netbeans/modules/keyring/fallback/FallbackProviderTest.java
diff --git a/keyring.impl/test/unit/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryptionTest.java b/keyring.fallback/test/unit/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryptionTest.java
rename from keyring.impl/test/unit/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryptionTest.java
rename to keyring.fallback/test/unit/src/org/netbeans/modules/keyring/fallback/MasterPasswordEncryptionTest.java
diff --git a/keyring.impl/manifest.mf b/keyring.impl/manifest.mf
--- a/keyring.impl/manifest.mf
+++ b/keyring.impl/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.keyring.impl
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
 OpenIDE-Module-Provides: org.netbeans.modules.keyring.impl
 
diff --git a/keyring.impl/nbproject/project.xml b/keyring.impl/nbproject/project.xml
--- a/keyring.impl/nbproject/project.xml
+++ b/keyring.impl/nbproject/project.xml
@@ -32,6 +32,14 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.netbeans.modules.keyring.fallback</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java b/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
--- a/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
+++ b/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
@@ -52,7 +52,7 @@
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.netbeans.modules.keyring.impl.Utils;
+import org.netbeans.modules.keyring.utils.Utils;
 import org.netbeans.modules.keyring.spi.EncryptionProvider;
 import org.openide.util.Utilities;
 import org.openide.util.lookup.ServiceProvider;
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -178,6 +178,7 @@
         favorites,\
         javahelp,\
         keyring,\
+        keyring.fallback,\
         keyring.impl,\
         libs.felix,\
         libs.jna,\