diff --git a/dev-java/idm-console-framework/ChangeLog b/dev-java/idm-console-framework/ChangeLog index 3526d741..58199cbc 100644 --- a/dev-java/idm-console-framework/ChangeLog +++ b/dev-java/idm-console-framework/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Oct 2007; Mario Fetka ++, ++, + +files/idm-console-framework-alt0.patch, + files/idm-console-framework-cvs.sh, + -idm-console-framework-1.1.0_pre20071006.ebuild: + add onlinehelp to tarball & install it + 07 Oct 2007; Mario Fetka idm-console-framework-1.1.0_pre20071006.ebuild: remove Gentoo Header diff --git a/dev-java/idm-console-framework/Manifest b/dev-java/idm-console-framework/Manifest index 49c1b71d..2ac80935 100644 --- a/dev-java/idm-console-framework/Manifest +++ b/dev-java/idm-console-framework/Manifest @@ -1,20 +1,24 @@ -AUX idm-console-framework-cvs.sh 342 RMD160 7d05fd55a852bbd2eeb76244c0b707636c9a2ae6 SHA1 035fe443f1d9fd41da8ff32115625219d4e1b801 SHA256 2dc79eb3590e97adc7a3e95976d44bc6a729ccfd09694d9b202fd872b9fdcc63 -MD5 01d2174b218e65258fb18c9f4a7771da files/idm-console-framework-cvs.sh 342 -RMD160 7d05fd55a852bbd2eeb76244c0b707636c9a2ae6 files/idm-console-framework-cvs.sh 342 -SHA256 2dc79eb3590e97adc7a3e95976d44bc6a729ccfd09694d9b202fd872b9fdcc63 files/idm-console-framework-cvs.sh 342 -DIST idm-console-framework-1.1.0-pre20071006.tar.bz2 704792 RMD160 f4d18cf8bc8ecbae3487e66bb2e876aaf924de2b SHA1 d656432b368308e4f0719e97bd2cfb492e7ae3c0 SHA256 0bede65dbcad838dadf0a4912fb11941d827dc13f5748ea4ec78651815e15bbd -EBUILD idm-console-framework-1.1.0_pre20071006.ebuild 1988 RMD160 13d304192603d8477b9ba41a5d6b76595ca36564 SHA1 643f9033decfb36d877838a2b9b0bae4b35fd43f SHA256 c712afdc81dce82e72fb04108ba6fdf0154fe581c7a25a4e04cf2d0e932d82e4 -MD5 dd0f94d34458e54ed54e4570f0d3d4b1 idm-console-framework-1.1.0_pre20071006.ebuild 1988 -RMD160 13d304192603d8477b9ba41a5d6b76595ca36564 idm-console-framework-1.1.0_pre20071006.ebuild 1988 -SHA256 c712afdc81dce82e72fb04108ba6fdf0154fe581c7a25a4e04cf2d0e932d82e4 idm-console-framework-1.1.0_pre20071006.ebuild 1988 -MISC ChangeLog 384 RMD160 34811750940f512a8477b26bfbbcffde0e101975 SHA1 988b0f687c83cc6060abf16c69b9cd5c31fb1253 SHA256 7d8dc849177490c645c0a7be07b2c5734eaf56fe545be4c1b73855a8c060112e -MD5 bcff9886e0dbd602caae14e6535b0558 ChangeLog 384 -RMD160 34811750940f512a8477b26bfbbcffde0e101975 ChangeLog 384 -SHA256 7d8dc849177490c645c0a7be07b2c5734eaf56fe545be4c1b73855a8c060112e ChangeLog 384 +AUX idm-console-framework-alt0.patch 6293 RMD160 12cab0e6524746816efb3190933bea9cb7f7ecf6 SHA1 0958f90eac22b32cb358543b16e3e6a41c714b5f SHA256 780f49cdbc1f6fff2cb28e734b4f9a964023e371b43f9355b015cb50f4953f04 +MD5 568c397f3641597a07c8c1cf7f620104 files/idm-console-framework-alt0.patch 6293 +RMD160 12cab0e6524746816efb3190933bea9cb7f7ecf6 files/idm-console-framework-alt0.patch 6293 +SHA256 780f49cdbc1f6fff2cb28e734b4f9a964023e371b43f9355b015cb50f4953f04 files/idm-console-framework-alt0.patch 6293 +AUX idm-console-framework-cvs.sh 430 RMD160 ca74b7729bafcff1fb9ac5954a283d362ea79695 SHA1 1f1efba513c81c25da16863204746a9a364e0796 SHA256 edf6e6d9278192dc8a838c3af9fb4937e72f2a8a78f1b49864be4310459e5ad5 +MD5 701b3d52572a7e4f87c6203a273ecc5a files/idm-console-framework-cvs.sh 430 +RMD160 ca74b7729bafcff1fb9ac5954a283d362ea79695 files/idm-console-framework-cvs.sh 430 +SHA256 edf6e6d9278192dc8a838c3af9fb4937e72f2a8a78f1b49864be4310459e5ad5 files/idm-console-framework-cvs.sh 430 +DIST idm-console-framework-1.1.0-pre20071007.tar.bz2 745359 RMD160 1deb3d2a80b41c288d3e2c815126765064c305a6 SHA1 08818b348dc82e6376e88281b6330e3ed8580925 SHA256 5b22d3f391cb41e0b6f0d8f28668f6bfb6f2fc2522e9ce8799f954091f0d279b +EBUILD idm-console-framework-1.1.0_pre20071007.ebuild 2160 RMD160 8f9849d03650fe3c8b49072841a5bda7c1c10478 SHA1 66d3dbe6810c8fc9d44985fcd71a0e42b9fdf258 SHA256 fa9deb574f8d7fbf94c19cbe94905fd28d7b4276aa638dd36062adb4a29eee1d +MD5 bd406dce6d579e316c0036e8d6ede75a idm-console-framework-1.1.0_pre20071007.ebuild 2160 +RMD160 8f9849d03650fe3c8b49072841a5bda7c1c10478 idm-console-framework-1.1.0_pre20071007.ebuild 2160 +SHA256 fa9deb574f8d7fbf94c19cbe94905fd28d7b4276aa638dd36062adb4a29eee1d idm-console-framework-1.1.0_pre20071007.ebuild 2160 +MISC ChangeLog 614 RMD160 9079cf821840364629a72071b288f417de9346ab SHA1 5d9a159d5a927ccd74f84cd4d2d907c2d4e6f7ce SHA256 4776d869f2265748933f98c06c0eada9eb1c6d73fc6a9c7f408992860f6d10b5 +MD5 c5cfd71a947ebb80857d03ecbd20075f ChangeLog 614 +RMD160 9079cf821840364629a72071b288f417de9346ab ChangeLog 614 +SHA256 4776d869f2265748933f98c06c0eada9eb1c6d73fc6a9c7f408992860f6d10b5 ChangeLog 614 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 -MD5 8964bd534078c724408299eb2a460a11 files/digest-idm-console-framework-1.1.0_pre20071006 322 -RMD160 6e51fe38e43c46691fab93b93e7d57e8ad0ffdef files/digest-idm-console-framework-1.1.0_pre20071006 322 -SHA256 25c006865929450cb492f15dc0cb3887fcf0b1931785f4c255e102aab3d1e83c files/digest-idm-console-framework-1.1.0_pre20071006 322 +MD5 48c9d635a05c1aaa764dfb022935dedc files/digest-idm-console-framework-1.1.0_pre20071007 322 +RMD160 f6808bf19c36327b3b7f6036c9ceb73a86c5aa6c files/digest-idm-console-framework-1.1.0_pre20071007 322 +SHA256 b4f90a6123f0f85618405afd996ec71d825a2df323761441188aa23903598171 files/digest-idm-console-framework-1.1.0_pre20071007 322 diff --git a/dev-java/idm-console-framework/files/digest-idm-console-framework-1.1.0_pre20071006 b/dev-java/idm-console-framework/files/digest-idm-console-framework-1.1.0_pre20071006 deleted file mode 100644 index 9f46fa2e..00000000 --- a/dev-java/idm-console-framework/files/digest-idm-console-framework-1.1.0_pre20071006 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f3cd9eb62ee57c69d4d4ca3e8564899e idm-console-framework-1.1.0-pre20071006.tar.bz2 704792 -RMD160 f4d18cf8bc8ecbae3487e66bb2e876aaf924de2b idm-console-framework-1.1.0-pre20071006.tar.bz2 704792 -SHA256 0bede65dbcad838dadf0a4912fb11941d827dc13f5748ea4ec78651815e15bbd idm-console-framework-1.1.0-pre20071006.tar.bz2 704792 diff --git a/dev-java/idm-console-framework/files/digest-idm-console-framework-1.1.0_pre20071007 b/dev-java/idm-console-framework/files/digest-idm-console-framework-1.1.0_pre20071007 new file mode 100644 index 00000000..f50f75ca --- /dev/null +++ b/dev-java/idm-console-framework/files/digest-idm-console-framework-1.1.0_pre20071007 @@ -0,0 +1,3 @@ +MD5 5862f1a0ed336aed9c4c27a9d3d4603f idm-console-framework-1.1.0-pre20071007.tar.bz2 745359 +RMD160 1deb3d2a80b41c288d3e2c815126765064c305a6 idm-console-framework-1.1.0-pre20071007.tar.bz2 745359 +SHA256 5b22d3f391cb41e0b6f0d8f28668f6bfb6f2fc2522e9ce8799f954091f0d279b idm-console-framework-1.1.0-pre20071007.tar.bz2 745359 diff --git a/dev-java/idm-console-framework/files/idm-console-framework-alt0.patch b/dev-java/idm-console-framework/files/idm-console-framework-alt0.patch new file mode 100644 index 00000000..3f17c13a --- /dev/null +++ b/dev-java/idm-console-framework/files/idm-console-framework-alt0.patch @@ -0,0 +1,99 @@ +diff -ur idm-console-framework/src/com/netscape/management/client/preferences/FilePreferenceManager.java idm-console-framework.new/src/com/netscape/management/client/preferences/FilePreferenceManager.java +--- idm-console-framework/src/com/netscape/management/client/preferences/FilePreferenceManager.java 2005-11-29 21:37:01 +0300 ++++ idm-console-framework.new/src/com/netscape/management/client/preferences/FilePreferenceManager.java 2007-08-08 12:41:08 +0400 +@@ -46,15 +46,15 @@ + String homePath = null; + Properties p = System.getProperties(); + +- File f = new File(Console.PREFERENCE_DIR); ++ File f = new File(com.netscape.management.client.console.Console.PREFERENCE_DIR); + if (!f.exists()) + f.mkdir(); + + if (!f.exists()) { +- Debug.println("error: cannot create/access" + Console.PREFERENCE_DIR); ++ Debug.println("error: cannot create/access" + com.netscape.management.client.console.Console.PREFERENCE_DIR); + return "."; + } +- return Console.PREFERENCE_DIR; ++ return com.netscape.management.client.console.Console.PREFERENCE_DIR; + } + + +diff -ur idm-console-framework/src/com/netscape/management/client/security/CertRequestWizard.java idm-console-framework.new/src/com/netscape/management/client/security/CertRequestWizard.java +--- idm-console-framework/src/com/netscape/management/client/security/CertRequestWizard.java 2006-02-09 01:13:18 +0300 ++++ idm-console-framework.new/src/com/netscape/management/client/security/CertRequestWizard.java 2007-08-08 12:40:29 +0400 +@@ -61,7 +61,7 @@ + IDataCollectionModel dataCollectionModel = new WizardDataCollectionModel(); + + final String PLUGIN_ID = "PLUGIN_ID"; +- final String PLUGIN_DIR = Console.PREFERENCE_DIR + "caplugin" + File.separator; ++ final String PLUGIN_DIR = com.netscape.management.client.console.Console.PREFERENCE_DIR + "caplugin" + File.separator; + final String DEFAULT_PLUGIN_CLASS = "com.netscape.management.client.security.csr.DefaultPlugin.class"; + final String DEFAULT_PLUGIN_DESC = "Manual Cert Request Plugin"; + +diff -ur idm-console-framework/src/com/netscape/management/client/topology/DomainNode.java idm-console-framework.new/src/com/netscape/management/client/topology/DomainNode.java +--- idm-console-framework/src/com/netscape/management/client/topology/DomainNode.java 2005-07-18 04:34:18 +0400 ++++ idm-console-framework.new/src/com/netscape/management/client/topology/DomainNode.java 2007-08-08 12:39:43 +0400 +@@ -200,14 +200,14 @@ + removeAllChildren(); + + String _i18nHostsCreatedOutOf = +- Console._resource.getString("splash", "hostsCreatedOutOf"); ++ com.netscape.management.client.console.Console._resource.getString("splash", "hostsCreatedOutOf"); + String _i18nHostsCreated = +- Console._resource.getString("splash", "hostsCreated"); ++ com.netscape.management.client.console.Console._resource.getString("splash", "hostsCreated"); + + long t1, t0 = System.currentTimeMillis(); + int cnt = 0; + +- SplashScreen splashScreen = SplashScreen.getInstance(); ++ com.netscape.management.client.console.SplashScreen splashScreen = com.netscape.management.client.console.SplashScreen.getInstance(); + + removeAllChildren(); + +@@ -215,7 +215,7 @@ + if (splashScreen != null && hostCount > 0 && + System.getProperty("profile") != null) { + splashScreen.setStatusText( MessageFormat.format( +- Console._resource.getString("splash", "hostsCount"), ++ com.netscape.management.client.console.Console._resource.getString("splash", "hostsCount"), + new Object[]{ new Integer(hostCount), getName()})); + } + +@@ -277,7 +277,7 @@ + + if (splashScreen != null && cnt > 1) { + splashScreen.setStatusText( +- Console._resource.getString("splash", "startingConsole")); ++ com.netscape.management.client.console.Console._resource.getString("splash", "startingConsole")); + //splashScreen.setStatusText( + // MessageFormat.format(Console._resource.getString("splash", "hostsCreatedDone"), + // new Object[] { new Integer(cnt), getName()})); +diff -ur idm-console-framework/src/com/netscape/management/client/topology/TopTopologyNode.java idm-console-framework.new/src/com/netscape/management/client/topology/TopTopologyNode.java +--- idm-console-framework/src/com/netscape/management/client/topology/TopTopologyNode.java 2005-07-18 04:34:19 +0400 ++++ idm-console-framework.new/src/com/netscape/management/client/topology/TopTopologyNode.java 2007-08-08 12:38:12 +0400 +@@ -50,7 +50,7 @@ + + + // Show status +- SplashScreen splashScreen = SplashScreen.getInstance(); ++ com.netscape.management.client.console.SplashScreen splashScreen = com.netscape.management.client.console.SplashScreen.getInstance(); + if (splashScreen != null && splashScreen.isVisible()) { + splashScreen.setStatusText( + Console._resource.getString("splash", "discoveryOn")); +diff -ur idm-console-framework/src/com/netscape/management/client/util/IndexDialog.java idm-console-framework.new/src/com/netscape/management/client/util/IndexDialog.java +--- idm-console-framework/src/com/netscape/management/client/util/IndexDialog.java 2005-07-18 04:34:26 +0400 ++++ idm-console-framework.new/src/com/netscape/management/client/util/IndexDialog.java 2007-08-08 12:34:08 +0400 +@@ -193,8 +193,8 @@ + protected JList populateIndex( URL url ) { + try { + AdmTask admTask = new AdmTask(url, +- Console.getConsoleInfo().getAuthenticationDN(), +- Console.getConsoleInfo().getAuthenticationPassword()); ++ com.netscape.management.client.console.Console.getConsoleInfo().getAuthenticationDN(), ++ com.netscape.management.client.console.Console.getConsoleInfo().getAuthenticationPassword()); + admTask.exec(); + + if (admTask.getException() != null) { diff --git a/dev-java/idm-console-framework/files/idm-console-framework-cvs.sh b/dev-java/idm-console-framework/files/idm-console-framework-cvs.sh index f4125c46..20294c6a 100755 --- a/dev-java/idm-console-framework/files/idm-console-framework-cvs.sh +++ b/dev-java/idm-console-framework/files/idm-console-framework-cvs.sh @@ -7,6 +7,7 @@ PKGNAME=idm-console-framework export CVSROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $PKGNAME-$VERSION-pre$DATE console +cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $PKGNAME-$VERSION-pre$DATE onlinehelp/console tar -cjf $PKGNAME-$VERSION-pre$DATE.tar.bz2 $PKGNAME-$VERSION-pre$DATE diff --git a/dev-java/idm-console-framework/idm-console-framework-1.1.0_pre20071006.ebuild b/dev-java/idm-console-framework/idm-console-framework-1.1.0_pre20071007.ebuild similarity index 82% rename from dev-java/idm-console-framework/idm-console-framework-1.1.0_pre20071006.ebuild rename to dev-java/idm-console-framework/idm-console-framework-1.1.0_pre20071007.ebuild index 315e7e42..de4f6634 100644 --- a/dev-java/idm-console-framework/idm-console-framework-1.1.0_pre20071006.ebuild +++ b/dev-java/idm-console-framework/idm-console-framework-1.1.0_pre20071007.ebuild @@ -21,17 +21,15 @@ S="${WORKDIR}/idm-console-framework-${MY_PV}" COMMON_DEP="=dev-java/jss-4* dev-java/ldapsdk" -RDEPEND="=virtual/jre-1.5* +RDEPEND=">=virtual/jre-1.5 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.5 ${COMMON_DEP}" -# Force 1.5 to be used for building -JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*" - src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/idm-console-framework-alt0.patch java-pkg_jarfrom ldapsdk-4.1 ldapjdk.jar java-pkg_jarfrom jss-3.4 xpclass.jar jss4.jar } @@ -43,7 +41,7 @@ src_compile() { use doc && eant -Dbuilt.dir=${S}/build \ -Dldapjdk.local.location=${S} \ - -Djss.local.location=${S} ${antflags} javadocs + -Djss.local.location=${S} ${antflags} javadoc } src_install() { @@ -52,9 +50,14 @@ src_install() { java-pkg_newjar ${S}/build/release/jars/idm-console-nmclf-${MY_V}.jar idm-console-nmclf.jar java-pkg_newjar ${S}/build/release/jars/idm-console-nmclf-${MY_V}_en.jar idm-console-nmclf_en.jar java-pkg_newjar ${S}/build/release/jars/idm-console-base-${MY_V}.jar idm-console-base.jar + insinto /usr/share/dirsrv/manual/en/console/help/graphics + doins ${S}/html/en/help/graphics/*.gif + insinto /usr/share/dirsrv/manual/en/console/help + doins ${S}/html/en/help/*.htm + # dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die -# use doc && java-pkg_dojavadoc build/javadocs + use doc && java-pkg_dojavadoc build/doc use examples && java-pkg_doexamples examples use source && java-pkg_dosrc src/com }