From 33f5f7e489e4aa51642cd7924b5b0243a62828fa Mon Sep 17 00:00:00 2001 From: Jiang Kai Date: Fri, 13 Mar 2020 09:37:03 +0800 Subject: [PATCH] init plexus-bsh-factory --- ...-plexus-containers-container-default.patch | 73 ++++++++++++++++++ ...us-bsh-factory-1.0-alpha-7-SNAPSHOT.tar.gz | Bin 0 -> 4808 bytes plexus-bsh-factory-license.txt | 26 +++++++ plexus-bsh-factory.spec | 46 +++++++++++ 4 files changed, 145 insertions(+) create mode 100644 0001-Migrate-to-plexus-containers-container-default.patch create mode 100644 plexus-bsh-factory-1.0-alpha-7-SNAPSHOT.tar.gz create mode 100644 plexus-bsh-factory-license.txt create mode 100644 plexus-bsh-factory.spec diff --git a/0001-Migrate-to-plexus-containers-container-default.patch b/0001-Migrate-to-plexus-containers-container-default.patch new file mode 100644 index 0000000..a095fb4 --- /dev/null +++ b/0001-Migrate-to-plexus-containers-container-default.patch @@ -0,0 +1,73 @@ +From e501d0ee85bb661173c4c5c3fd1c74fabe78c2e3 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 10 Apr 2013 11:30:35 +0200 +Subject: [PATCH] Migrate to plexus-containers-container-default + +--- + .../component/factory/bsh/BshComponentFactory.java | 26 +++++++++++++++++----- + 1 file changed, 20 insertions(+), 6 deletions(-) + +diff --git a/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java b/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java +index f2f3437..5e39fcf 100644 +--- a/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java ++++ b/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java +@@ -8,6 +8,8 @@ import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.component.factory.AbstractComponentFactory; + import org.codehaus.plexus.component.factory.ComponentInstantiationException; + import org.codehaus.plexus.component.repository.ComponentDescriptor; ++import org.codehaus.plexus.component.repository.exception.ComponentLookupException; ++import org.codehaus.plexus.logging.Logger; + import org.codehaus.plexus.util.IOUtil; + + import java.io.FileNotFoundException; +@@ -68,24 +70,31 @@ public class BshComponentFactory + catch ( EvalError evalError ) + { + containerRealm.display(); +- +- container.getLogger().info( "Error text: " + evalError.getErrorText() ); +- ++ ++ try ++ { ++ container.lookup( Logger.class ).info( "Error text: " + evalError.getErrorText() ); ++ } ++ catch ( ComponentLookupException e ) ++ { ++ throw new ComponentInstantiationException( e ); ++ } ++ + throw new ComponentInstantiationException( "Cannot build component for: " + +- componentDescriptor.getComponentKey() + ++ componentDescriptor.toString() + + "; unable to read BeanShell script", evalError ); + } + catch ( FileNotFoundException e ) + { + containerRealm.display(); + throw new ComponentInstantiationException( "Cannot build component for: " + +- componentDescriptor.getComponentKey() + ++ componentDescriptor.toString() + + "; unable to read BeanShell script", e ); + } + catch ( IOException e ) + { + throw new ComponentInstantiationException( "Cannot build component for: " + +- componentDescriptor.getComponentKey() + ++ componentDescriptor.toString() + + "; unable to read BeanShell script", e ); + } + finally +@@ -96,4 +105,9 @@ public class BshComponentFactory + return result; + } + ++ public String getId() ++ { ++ return getClass().toString(); ++ } ++ + } +-- +1.8.1.4 + diff --git a/plexus-bsh-factory-1.0-alpha-7-SNAPSHOT.tar.gz b/plexus-bsh-factory-1.0-alpha-7-SNAPSHOT.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..07116a8f25016b1e18b3592cf2eb315733ab90f1 GIT binary patch literal 4808 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 literal 0 HcmV?d00001 diff --git a/plexus-bsh-factory-license.txt b/plexus-bsh-factory-license.txt new file mode 100644 index 0000000..9c833b0 --- /dev/null +++ b/plexus-bsh-factory-license.txt @@ -0,0 +1,26 @@ +From jason@maven.org Wed Jul 9 21:16:12 2008 +Return-Path: +To: dev@plexus.codehaus.org + +No one uses it anyway, so you can safely remove it. But the license is MIT if not stated, though it's all switching to ASL. + +***** + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec new file mode 100644 index 0000000..93e75d0 --- /dev/null +++ b/plexus-bsh-factory.spec @@ -0,0 +1,46 @@ +Name: plexus-bsh-factory +Version: 1.0 +Release: 1.20.a7 +Epoch: 0 +Summary: Plexus Bsh component factory +License: MIT +URL: https://github.com/codehaus/plexus +BuildArch: noarch +Source0: https://github.com/codehaus/plexus/archive/plexus-bsh-factory-1.0-alpha-7-SNAPSHOT.tar.gz +Source1: plexus-bsh-factory-license.txt + +Patch0001: 0001-Migrate-to-plexus-containers-container-default.patch + +BuildRequires: maven-local mvn(bsh:bsh) mvn(classworlds:classworlds) mvn(org.codehaus.plexus:plexus-container-default) mvn(org.codehaus.plexus:plexus-utils) + +%description +Bsh component class creator for Plexus. + +%package help +Summary: Helpful information for plexus-bsh-factory +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} + +%description help +Documents and helpful information for plexus-bsh-factory. + +%prep +%autosetup -n plexus-plexus-bsh-factory-1.0-alpha-7-SNAPSHOT -p1 +cp release-pom.xml pom.xml +cp -p %{SOURCE1} . + +%build +%mvn_file : plexus/bsh-factory +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%doc plexus-bsh-factory-license.txt + +%files help -f .mfiles-javadoc + +%changelog +* Thu Mar 12 2020 Jiang Kai - 1.0-1.20.a7 +- Package init