From a69123704e9018c9ad1b0b9e00e7311616807cea Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 29 Jun 2019 14:13:20 +0200 Subject: [PATCH] Generate some IDE features via Maven --- .../org.argeo.slc.ide.node/.gitignore | 4 ++ ide/features/org.argeo.slc.ide.node/.project | 17 ++++++++ .../META-INF/MANIFEST.MF | 12 ++++++ ide/features/org.argeo.slc.ide.node/bnd.bnd | 0 ide/features/org.argeo.slc.ide.node/pom.xml | 40 +++++++++++++++++++ ide/features/org.argeo.slc.studio/feature.xml | 4 ++ ide/features/pom.xml | 17 ++++++++ .../org.argeo.slc.studio.ui/log4j.properties | 12 ++++++ ide/plugins/pom.xml | 14 ++++--- ide/pom.xml | 12 ++++-- pom.xml | 1 + 11 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 ide/features/org.argeo.slc.ide.node/.gitignore create mode 100644 ide/features/org.argeo.slc.ide.node/.project create mode 100644 ide/features/org.argeo.slc.ide.node/META-INF/MANIFEST.MF create mode 100644 ide/features/org.argeo.slc.ide.node/bnd.bnd create mode 100644 ide/features/org.argeo.slc.ide.node/pom.xml create mode 100644 ide/features/pom.xml create mode 100644 ide/plugins/org.argeo.slc.studio.ui/log4j.properties diff --git a/ide/features/org.argeo.slc.ide.node/.gitignore b/ide/features/org.argeo.slc.ide.node/.gitignore new file mode 100644 index 000000000..79d4b2590 --- /dev/null +++ b/ide/features/org.argeo.slc.ide.node/.gitignore @@ -0,0 +1,4 @@ +/target/ +*.target +/feature.xml +/modularDistribution.csv diff --git a/ide/features/org.argeo.slc.ide.node/.project b/ide/features/org.argeo.slc.ide.node/.project new file mode 100644 index 000000000..b133f951b --- /dev/null +++ b/ide/features/org.argeo.slc.ide.node/.project @@ -0,0 +1,17 @@ + + + org.argeo.slc.ide.node + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/ide/features/org.argeo.slc.ide.node/META-INF/MANIFEST.MF b/ide/features/org.argeo.slc.ide.node/META-INF/MANIFEST.MF new file mode 100644 index 000000000..ff0e38925 --- /dev/null +++ b/ide/features/org.argeo.slc.ide.node/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Automatic-Module-Name: org.argeo.slc.ide.node +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-ManifestVersion: 2 +Bundle-Name: IDE CMS Node +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-SymbolicName: org.argeo.slc.ide.node +Bundle-Version: 2.1.16.SNAPSHOT-r201906291110 +Include-Resource: modularDistribution.csv=modularDistribution.csv,featur + e.xml=feature.xml +Private-Package: !* +SLC-Category: org.argeo.slc.ide diff --git a/ide/features/org.argeo.slc.ide.node/bnd.bnd b/ide/features/org.argeo.slc.ide.node/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/ide/features/org.argeo.slc.ide.node/pom.xml b/ide/features/org.argeo.slc.ide.node/pom.xml new file mode 100644 index 000000000..d6c8fb779 --- /dev/null +++ b/ide/features/org.argeo.slc.ide.node/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + org.argeo.slc.ide + features + 2.1.16-SNAPSHOT + .. + + org.argeo.slc.ide.node + jar + IDE CMS Node + + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + + + generate-descriptors + + descriptors + + generate-resources + + + + + + + + + org.argeo.commons + org.argeo.dep.cms.node + ${version.argeo-commons} + + + + \ No newline at end of file diff --git a/ide/features/org.argeo.slc.studio/feature.xml b/ide/features/org.argeo.slc.studio/feature.xml index 416010900..e8a6eaf67 100644 --- a/ide/features/org.argeo.slc.studio/feature.xml +++ b/ide/features/org.argeo.slc.studio/feature.xml @@ -39,6 +39,10 @@ and limitations under the License. id="org.argeo.slc.ide.osgi" version="0.0.0"/> + + diff --git a/ide/features/pom.xml b/ide/features/pom.xml new file mode 100644 index 000000000..03bfaa7ca --- /dev/null +++ b/ide/features/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + + org.argeo.slc.ide + argeo-ide + 2.1.16-SNAPSHOT + .. + + features + pom + IDE Features + + + + \ No newline at end of file diff --git a/ide/plugins/org.argeo.slc.studio.ui/log4j.properties b/ide/plugins/org.argeo.slc.studio.ui/log4j.properties new file mode 100644 index 000000000..122f42a67 --- /dev/null +++ b/ide/plugins/org.argeo.slc.studio.ui/log4j.properties @@ -0,0 +1,12 @@ +log4j.rootLogger=WARN, development + +log4j.logger.org.argeo=DEBUG + +## Appenders +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n + +log4j.appender.development=org.apache.log4j.ConsoleAppender +log4j.appender.development.layout=org.apache.log4j.PatternLayout +log4j.appender.development.layout.ConversionPattern=%d{ABSOLUTE} %m (%F:%L) [%t] %p %n diff --git a/ide/plugins/pom.xml b/ide/plugins/pom.xml index 39edbe48c..2f2e8efdc 100644 --- a/ide/plugins/pom.xml +++ b/ide/plugins/pom.xml @@ -1,15 +1,17 @@ - + 4.0.0 - org.argeo.slc - ide - 2.1.11-SNAPSHOT + org.argeo.slc.ide + argeo-ide + 2.1.16-SNAPSHOT .. - ide-plugins + plugins pom IDE Plugins - + \ No newline at end of file diff --git a/ide/pom.xml b/ide/pom.xml index 64dd819ed..5d522b794 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -1,15 +1,19 @@ - + 4.0.0 org.argeo.slc argeo-slc - 2.1.11-SNAPSHOT + 2.1.16-SNAPSHOT .. - ide + org.argeo.slc.ide + argeo-ide pom - IDE + SLC IDE plugins + features \ No newline at end of file diff --git a/pom.xml b/pom.xml index b729acb49..f904ee872 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ dep dist demo + ide http://projects.argeo.org/slc/ -- 2.39.2