diff options
| -rw-r--r-- | bundles/org.eclipse.osgi/.classpath | 7 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/build.properties | 1 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java (renamed from bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java) | 0 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java (renamed from bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java) | 0 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java (renamed from bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java) | 0 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java (renamed from bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java) | 0 |
6 files changed, 3 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/.classpath b/bundles/org.eclipse.osgi/.classpath index f47fc74de..732e8ed83 100644 --- a/bundles/org.eclipse.osgi/.classpath +++ b/bundles/org.eclipse.osgi/.classpath @@ -4,15 +4,14 @@ <classpathentry kind="lib" path="osgi/xmlParserAPIs.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OSGi%Minimum-1.1"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="console/src"/> - <classpathentry kind="src" path="supplement/src"/> <classpathentry kind="src" path="osgi/src"/> + <classpathentry kind="src" path="supplement/src"/> <classpathentry kind="src" path="core/adaptor"/> <classpathentry kind="src" path="core/framework"/> + <classpathentry kind="src" path="resolver/src"/> <classpathentry kind="src" path="defaultAdaptor/src"/> <classpathentry kind="src" path="eclipseAdaptor/src"/> - <classpathentry kind="src" path="resolver/src"/> - <classpathentry kind="src" path="jarverifier"/> <classpathentry kind="src" path="security/src"/> + <classpathentry kind="src" path="console/src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties index 15473f98e..bc7063676 100644 --- a/bundles/org.eclipse.osgi/build.properties +++ b/bundles/org.eclipse.osgi/build.properties @@ -27,7 +27,6 @@ source.. = osgi/src,\ eclipseAdaptor/src/,\ console/src/,\ supplement/src/,\ - jarverifier/,\ security/src/ output.. = bin/ jre.compilation.profile = CDC-1.0/Foundation-1.0 diff --git a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java index 338f42ce5..338f42ce5 100644 --- a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java +++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java diff --git a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java index 5d2bb3ffc..5d2bb3ffc 100644 --- a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java +++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java diff --git a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java index fb56265f5..fb56265f5 100644 --- a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java +++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java diff --git a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java index 6ca7c68a1..6ca7c68a1 100644 --- a/bundles/org.eclipse.osgi/jarverifier/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java +++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java |