svn commit: r936931 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Thu Apr 22 16:14:48 2010 New Revision: 936931 URL: http://svn.apache.org/viewvc?rev=936931view=rev Log: [UIMA-1756] add version for maven-bundle-plugin. remove extra execution of remote-resources plugin - no longer needed. Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=936931r1=936930r2=936931view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Thu Apr 22 16:14:48 2010 @@ -268,6 +268,14 @@ /plugin plugin + groupIdorg.apache.felix/groupId + artifactIdmaven-bundle-plugin/artifactId + !-- version 2.0.0 fails -- + version2.0.1/version + extensionstrue/extensions +/plugin + +plugin groupIdorg.apache.rat/groupId artifactIdapache-rat-plugin/artifactId version0.6/version @@ -312,9 +320,8 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-remote-resources-plugin/artifactId -executions +executions execution -iduima-notice/id goalsgoalprocess/goal/goals configuration resourceBundles
svn commit: r936932 - in /uima/build/trunk/parent-poms: parent-pom-uimaj-eclipse-plugins-ibm-notice/ parent-pom-uimaj-eclipse-plugins-ibm-notice/target/ parent-pom-uimaj-eclipse-plugins-ibm-notice/tar
Author: schor
Date: Thu Apr 22 16:16:59 2010
New Revision: 936932
URL: http://svn.apache.org/viewvc?rev=936932view=rev
Log:
change default of ibm-notice for eclipse-plugins - most will not have the extra
ibm notice.
Added:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/maven-shared-archive-resources/
Modified:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
Added:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml?rev=936932view=auto
==
---
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
(added)
+++
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
Thu Apr 22 16:16:59 2010
@@ -0,0 +1,78 @@
+!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ License); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--
+
+!-- this is the common parent pom for the uima java sdk --
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj-eclipse-plugins/artifactId
+version1-SNAPSHOT/version
+ /parent
+
+ groupIdorg.apache.uima/groupId
+ artifactIdparent-pom-uimaj-eclipse-plugins-ibm-notice/artifactId
+ packagingpom/packaging
+ version1-SNAPSHOT/version
+
+ nameApache UIMA Java SDK Parent for Eclipse Plugins with IBM copyright in
the Notice/name
+ descriptionAdds the IBM Copyright to the Notice file for selected source
files/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootbuild/uimaScmRoot
+
uimaScmProjectparent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/uimaScmProject
+postNoticeText
+Portions of UIMA were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+Software Grant License Agreement, informally known as the
+IBM UIMA License Agreement.
+Copyright (c) 2003, 2006 IBM Corporation.
+/postNoticeText
+ /properties
+
+ !--reporting--
+
+ !-- profiles --
+/project
\ No newline at end of file
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml?rev=936932r1=936931r2=936932view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
(original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml Thu
Apr 22 16:16:59 2010
@@ -42,6 +42,7 @@
nameApache UIMA Java SDK common Eclipse plugin settings/name
descriptionHolds common, factored out settings for eclipse
plugins/description
+ url${uimaWebsiteUrl}/url
!-- Special inheritance
svn commit: r936935 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/
Author: schor Date: Thu Apr 22 16:21:54 2010 New Revision: 936935 URL: http://svn.apache.org/viewvc?rev=936935view=rev Log: no Jira - delete target mistakenly checked in Removed: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/
svn commit: r936936 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/
Author: schor Date: Thu Apr 22 16:23:27 2010 New Revision: 936936 URL: http://svn.apache.org/viewvc?rev=936936view=rev Log: no Jira svn ignore target Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/ (props changed) Propchange: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/ -- --- svn:ignore (added) +++ svn:ignore Thu Apr 22 16:23:27 2010 @@ -0,0 +1 @@ +target
svn commit: r937016 - /uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jmx/RemoteJMXServer.java
Author: cwiklik
Date: Thu Apr 22 19:09:29 2010
New Revision: 937016
URL: http://svn.apache.org/viewvc?rev=937016view=rev
Log:
UIMA-1726 Added additional test to determine if the broker is running with JMX
connector
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jmx/RemoteJMXServer.java
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jmx/RemoteJMXServer.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jmx/RemoteJMXServer.java?rev=937016r1=937015r2=937016view=diff
==
---
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jmx/RemoteJMXServer.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jmx/RemoteJMXServer.java
Thu Apr 22 19:09:29 2010
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import javax.jms.JMSException;
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
@@ -36,6 +37,7 @@ import org.apache.activemq.broker.jmx.Qu
import org.apache.uima.UIMAFramework;
import org.apache.uima.adapter.jms.JmsConstants;
import org.apache.uima.util.Level;
+import org.springframework.jmx.JmxException;
public class RemoteJMXServer {
private static final Class CLASS_NAME = RemoteJMXServer.class;
@@ -75,6 +77,21 @@ public class RemoteJMXServer {
JMXServiceURL url = new JMXServiceURL(remoteJmxUrl);
jmxc = JMXConnectorFactory.connect(url, null);
brokerMBeanServer = jmxc.getMBeanServerConnection();
+// Its possible that the above code succeeds even though the broker runs
+// with no JMX Connector. At least on windows the above does not throw an
+// exception as expected. It appears that the broker registers self JVMs
MBeanServer
+// but it does *not* register any Connections, nor Queues. The code below
+// checks if the MBean server we are connected to has any QueueMBeans
registered.
+// A broker with jmx connector should have queue mbeans registered and thus
+// the code below should always succeed. Conversely, a broker with no jmx
connector
+// reports no queue mbeans.
+
+// Query broker MBeanServer for QueueMBeans
+Set queueSet = brokerMBeanServer.queryNames(new ObjectName(jmxDomain
++ :*,Type=Queue), (QueryExp) null);
+if ( queueSet.isEmpty() ) { // No QueueMBeans, meaning no JMX support
+ throw new JmxException(ActiveMQ Broker Not Configured With JMX
Support);
+}
// Query JMX Server for Broker MBean. We need the broker's name from an
MBean to construct
// queue query string.
svn commit: r937018 - /uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
Author: schor
Date: Thu Apr 22 19:13:46 2010
New Revision: 937018
URL: http://svn.apache.org/viewvc?rev=937018view=rev
Log:
[UIMA-1756] add uimaj aggregate pom
Added:
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
Added: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml?rev=937018view=auto
==
--- uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml (added)
+++ uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml Thu Apr 22
19:13:46 2010
@@ -0,0 +1,84 @@
+!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ License); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj/artifactId
+version1-SNAPSHOT/version
+ /parent
+
+ artifactIdaggregate-pom-uimaj/artifactId
+ packagingpom/packaging
+ version2.3.1-SNAPSHOT/version
+ nameUIMA Aggregate POM ${artifactId}: UIMA Base/name
+ descriptionThe aggregate for the base UIMA framework build and
release/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+uimaDependencyVersion2.3.1-SNAPSHOT/uimaDependencyVersion
+ /properties
+
+ modules
+module../uimaj-core/module
+module../uimaj-cpe/module
+module../uimaj-examples/module
+module../uimaj-tools/module
+module../uimaj-adapter-vinci/module
+module../uimaj-adapter-soap/module
+module../uimaj-test-util/module
+module../uimaj-component-test-util/module
+module../jVinci/module
+module../aggregate-pom-uimaj-eclipse-plugins/module
+!--moduledistr-superPom/module--
+module../uimaj-document-annotation/module
+module../PearPackagingMavenPlugin/module
+!-- the internal tools project is not part of any release
+ and can't be built automatically - to build it,
+ cd to the project directory and do mvn install --
+!--module../uimaj-internal-tools/module--
+module../uimaj-bootstrap/module
+ /modules
+/project
\ No newline at end of file
svn commit: r937020 - /uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/
Author: schor Date: Thu Apr 22 19:15:18 2010 New Revision: 937020 URL: http://svn.apache.org/viewvc?rev=937020view=rev Log: no Jira - set svn ignore for target and .project Modified: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/ (props changed) Propchange: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/ -- --- svn:ignore (added) +++ svn:ignore Thu Apr 22 19:15:18 2010 @@ -0,0 +1,2 @@ +target +.project
svn commit: r937026 - /uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/
Author: schor Date: Thu Apr 22 19:16:11 2010 New Revision: 937026 URL: http://svn.apache.org/viewvc?rev=937026view=rev Log: [UIMA-1756] add uimaj eclipse plugins aggregate pom Added: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/
svn commit: r937035 - /uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
Author: schor
Date: Thu Apr 22 19:45:14 2010
New Revision: 937035
URL: http://svn.apache.org/viewvc?rev=937035view=rev
Log:
[UIMA-1756] add description, add scm connection info, change parent poms, code
version explictly, factor licenses, remove repository info (is inherited),
change 2 eclipse lower version number ranges so that artifacts can be found in
the repos, add RAT exclusions where needed for test resources, etc., remove
relative-path for parent pom
Modified:
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml?rev=937035r1=937034r2=937035view=diff
==
--- uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml Thu Apr 22
19:45:14 2010
@@ -18,38 +18,46 @@
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- !-- groupId omitted - inherited from parent --
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj-eclipse-plugins/artifactId
+version1-SNAPSHOT/version
+ /parent
+
artifactIduimaj-ep-cas-editor/artifactId
+ version2.3.1.SNAPSHOT/version
packagingbundle/packaging
- !-- version omitted - inherited from parent--
- nameApache UIMA Cas Editor Eclipse Plugin/name
- urlhttp://incubator.apache.org/uima/url
- licenses
- license
- nameThe Apache Software License, Version 2.0/name
-
urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
- distributionrepo/distribution
- /license
- /licenses
- scm
- urlhttp://svn.apache.org/viewvc/incubator/uima/url
- /scm
- parent
- groupIdorg.apache.uima/groupId
- artifactIduimaj-eclipse-plugins/artifactId
- version2.3.0.incubating/version !-- this comment is a flag
for changeVersion --
-relativePath../uimaj/eclipse-plugin-superPom/relativePath
- /parent
-
- repositories
- repository
- idApacheIncubatorRepository/id
- url
-
http://people.apache.org/repo/m2-incubating-repository
- /url
- /repository
- /repositories
-
+ nameUIMA Eclipse: ${artifactId}/name
+ descriptionAllows editing the contents of a saved CAS/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+uimaDependencyVersion2.3.1-SNAPSHOT/uimaDependencyVersion
+ /properties
+
dependencies
dependency
groupIdjunit/groupId
@@ -66,14 +74,14 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-core/artifactId
- version${uimaj-release-version}/version
+ version${uimaDependencyVersion}/version
scopecompile/scope
/dependency
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-tools/artifactId
- version${uimaj-release-version}/version
+ version${uimaDependencyVersion}/version
scopecompile/scope
/dependency
@@ -103,7 +111,11 @@
dependency
groupIdorg.eclipse.swt/groupId
artifactIdorg.eclipse.swt.win32.win32.x86/artifactId
- version[3.3.0.0,4.0.0)/version
+ !-- changing the lower version number to 3.2.0,
+
