--- a/components/beanshell/beanshell.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/beanshell/beanshell.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,28 +18,32 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/runtime/java/beanshell@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="beanshell - a small and embeddable Java source interpreter"
+set name=pkg.description \
+ value="BeanShell is a small, free, embeddable Java source interpreter with object scripting language features, written in Java. BeanShell dynamically executes standard Java syntax and extends it with common scripting conveniences such as loose types, commands, and method closures like those in Perl and JavaScript."
set name=pkg.human-version value=$(COMPONENT_VERSION)
-set name=pkg.summary value="beanshell - a small and embeddable Java source interpreter"
-set name=pkg.description value="BeanShell is a small, free, embeddable Java source interpreter with object scripting language features, written in Java. BeanShell dynamically executes standard Java syntax and extends it with common scripting conveniences such as loose types, commands, and method closures like those in Perl and JavaScript."
-set name=com.oracle.info.description value="the beanshell Java source interpreter"
+set name=com.oracle.info.description \
+ value="the beanshell Java source interpreter"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
- value="org.opensolaris.category.2008:Development/Java"
+ value=org.opensolaris.category.2008:Development/Java
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2009/270
+set name=org.opensolaris.arc-caseid value=PSARC/2009/270
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file scripts/bsh path=usr/bin/beansh
+link path=usr/bin/beanshell target=beansh
file path=usr/demo/bsh/webapps/bshservlet-wbsh.war
file path=usr/demo/bsh/webapps/bshservlet.war
-file docs/manual/bshcommands-bshdoc.xml path=usr/share/doc/beanshell/bshcommands-bshdoc.xml
+file docs/manual/bshcommands-bshdoc.xml \
+ path=usr/share/doc/beanshell/bshcommands-bshdoc.xml
file path=usr/share/lib/java/bsh-2.0b4.jar
file path=usr/share/lib/java/bsh-bsf-2.0b4.jar
file path=usr/share/lib/java/bsh-classgen-2.0b4.jar
@@ -50,24 +54,61 @@
file path=usr/share/lib/java/bsh-util-2.0b4.jar
file path=usr/share/lib/java/javadoc/beanshell/allclasses-frame.html
file path=usr/share/lib/java/javadoc/beanshell/allclasses-noframe.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/BshClassManager.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/BSHFormalComment.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/BSHPackageDeclaration.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/BshClassManager.Listener.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/BSHFormalComment.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/BshClassManager.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/BshIterator.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/BshMethod.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/BSHPackageDeclaration.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/CallStack.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Capabilities.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/Capabilities.Unavailable.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BshClassManager.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Capabilities.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGenerator.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGeneratorImpl.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGeneratorUtil.ConstructorArgs.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGeneratorUtil.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassIdentifier.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassPathException.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/CollectionManager.BasicBshIterator.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/CollectionManager.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Console.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ConsoleInterface.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/DelayedEvalBshMethod.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/EvalError.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ExternalNameSpace.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Interpreter.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/InterpreterError.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/JavaCharStream.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Modifiers.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/NameSource.Listener.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/NameSource.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/NameSpace.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ParseException.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Parser.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ParserConstants.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ParserTokenManager.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ParserTreeConstants.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Primitive.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/ReflectManager.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Remote.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/StringUtil.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/TargetError.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/This.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Token.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/TokenMgrError.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/UtilEvalError.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/UtilTargetError.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/Variable.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/XThis.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BSHFormalComment.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BSHPackageDeclaration.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BshClassManager.Listener.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BSHFormalComment.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BshClassManager.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BshIterator.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BshMethod.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/BSHPackageDeclaration.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/CallStack.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/Capabilities.Unavailable.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/Capabilities.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/Capabilities.Unavailable.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/ClassGenerator.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/ClassGeneratorImpl.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/ClassGeneratorUtil.ConstructorArgs.html
@@ -85,8 +126,8 @@
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/InterpreterError.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/JavaCharStream.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/Modifiers.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/NameSource.Listener.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/NameSource.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/NameSource.Listener.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/NameSpace.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/ParseException.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/Parser.html
@@ -105,81 +146,59 @@
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/UtilTargetError.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/Variable.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/class-use/XThis.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGenerator.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGeneratorImpl.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGeneratorUtil.ConstructorArgs.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassGeneratorUtil.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassIdentifier.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassLoader.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.AmbiguousName.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.ClassSource.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.DirClassSource.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.GeneratedClassSource.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.JarClassSource.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.MappingFeedback.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/BshClassPath.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/ClassManagerImpl.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/ClassPathListener.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/DiscreteFilesClassLoader.ClassSourceMap.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/DiscreteFilesClassLoader.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassLoader.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.AmbiguousName.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.ClassSource.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.DirClassSource.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.GeneratedClassSource.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.JarClassSource.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.MappingFeedback.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/BshClassPath.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/ClassManagerImpl.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/ClassPathListener.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/DiscreteFilesClassLoader.ClassSourceMap.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/class-use/DiscreteFilesClassLoader.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/ClassManagerImpl.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/ClassPathListener.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/DiscreteFilesClassLoader.ClassSourceMap.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/DiscreteFilesClassLoader.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/package-frame.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/package-summary.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/package-tree.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/classpath/package-use.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ClassPathException.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/CollectionManager.BasicBshIterator.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/CollectionManager.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Console.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ConsoleInterface.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/DelayedEvalBshMethod.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/EvalError.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ExternalNameSpace.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Interpreter.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/InterpreterError.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/JavaCharStream.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Modifiers.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/NameSource.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/NameSource.Listener.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/NameSpace.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/package-frame.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/package-summary.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/package-tree.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/package-use.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ParseException.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Parser.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ParserConstants.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ParserTokenManager.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ParserTreeConstants.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Primitive.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/ReflectManagerImpl.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/class-use/ReflectManagerImpl.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/package-frame.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/package-summary.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/package-tree.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/package-use.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/reflect/ReflectManagerImpl.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/ReflectManager.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Remote.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/StringUtil.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/TargetError.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/This.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Token.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/TokenMgrError.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/AWTConsole.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/AWTDemoApplet.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/AWTRemoteApplet.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/BshCanvas.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/ClassBrowser.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/GUIConsoleInterface.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/Httpd.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JConsole.BlockingPipedInputStream.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JConsole.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JDemoApplet.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JRemoteApplet.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/NameCompletion.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/NameCompletionTable.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/Sessiond.html
+file path=usr/share/lib/java/javadoc/beanshell/bsh/util/Util.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/class-use/AWTConsole.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/class-use/AWTDemoApplet.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/class-use/AWTRemoteApplet.html
@@ -195,25 +214,10 @@
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/class-use/NameCompletionTable.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/class-use/Sessiond.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/class-use/Util.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/ClassBrowser.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/GUIConsoleInterface.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/Httpd.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JConsole.BlockingPipedInputStream.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JConsole.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JDemoApplet.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/JRemoteApplet.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/NameCompletion.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/NameCompletionTable.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/package-frame.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/package-summary.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/package-tree.html
file path=usr/share/lib/java/javadoc/beanshell/bsh/util/package-use.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/Sessiond.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/util/Util.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/UtilEvalError.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/UtilTargetError.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/Variable.html
-file path=usr/share/lib/java/javadoc/beanshell/bsh/XThis.html
file path=usr/share/lib/java/javadoc/beanshell/constant-values.html
file path=usr/share/lib/java/javadoc/beanshell/deprecated-list.html
file path=usr/share/lib/java/javadoc/beanshell/help-doc.html
@@ -223,13 +227,12 @@
file path=usr/share/lib/java/javadoc/beanshell/overview-summary.html
file path=usr/share/lib/java/javadoc/beanshell/overview-tree.html
file path=usr/share/lib/java/javadoc/beanshell/package-list
-file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar.gif
file path=usr/share/lib/java/javadoc/beanshell/resources/background.gif
file path=usr/share/lib/java/javadoc/beanshell/resources/tab.gif
+file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar.gif
file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar_end.gif
file path=usr/share/lib/java/javadoc/beanshell/serialized-form.html
file path=usr/share/lib/java/javadoc/beanshell/stylesheet.css
file beansh.1 path=usr/share/man/man1/beansh.1
file beanshell.1 path=usr/share/man/man1/beanshell.1
-link path=usr/bin/beanshell target=beansh
license beanshell.license license="LGPLv2.1, SPL"