2012/5/17 Ioan Eugen Stan <[email protected]>: > I've attached a patch. Is this ok? Not sure how to integrate the > License in the license file.
mailing list strip attachments, so I don't know. IIRC you just need to append the license to this file: you can see we already have many 3 clause BSD there: http://svn.apache.org/repos/asf/james/app/trunk/src/main/licensing/app/license-for-binary.txt Stefano > 2012/5/17 Ioan Eugen Stan <[email protected]>: >> 2012/5/17 Stefano Bagnara <[email protected]>: >>> When adding new libraries to the projects you should take care of the >>> LICENSING data updates or at least add a blocker JIRA issue over the >>> next release. >>> If it is a 3 clause BSD license then maybe it suffice to append their >>> license to the resulting "app" license file (with a pointer to the >>> involved jars). >>> >>> Stefano >> >> Hi Stefano, >> >> It's a BSD license so I'll append the text to the LICENSE with pointers. >> http://jetm.void.fm/license.html >> >> Thanks for remanding me. >> >> >>> 2012/5/17 <[email protected]>: >>>> Author: ieugen >>>> Date: Thu May 17 08:45:42 2012 >>>> New Revision: 1339519 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=1339519&view=rev >>>> Log: >>>> JAMESAPP-10 >>>> >>>> - moved jetm libraries into a separate maven profile named "with-jetm", >>>> active by default >>>> - moved all jetm configuration into a separate file: >>>> conf/jetm-monitoring.conf >>>> - added line to spring-server to include this file - commented by default >>>> - default monitoring interface provided by config is JETM HTTP console. >>>> >>>> Added: >>>> james/app/trunk/src/main/resources/jetm-monitoring.conf >>>> Modified: >>>> james/app/trunk/pom.xml >>>> >>>> james/app/trunk/src/main/resources/META-INF/org/apache/james/spring-server.xml >>>> >>>> Modified: james/app/trunk/pom.xml >>>> URL: >>>> http://svn.apache.org/viewvc/james/app/trunk/pom.xml?rev=1339519&r1=1339518&r2=1339519&view=diff >>>> ============================================================================== >>>> --- james/app/trunk/pom.xml (original) >>>> +++ james/app/trunk/pom.xml Thu May 17 08:45:42 2012 >>>> @@ -428,18 +428,7 @@ >>>> <scope>runtime</scope> >>>> <version>${protocols.version}</version> >>>> </dependency> >>>> - <dependency> >>>> - <groupId>fm.void.jetm</groupId> >>>> - <artifactId>jetm</artifactId> >>>> - <version>1.2.3</version> >>>> - </dependency> >>>> - <dependency> >>>> - <groupId>fm.void.jetm</groupId> >>>> - <artifactId>jetm-optional</artifactId> >>>> - <version>1.2.3</version> >>>> - </dependency> >>>> </dependencies> >>>> - >>>> <build> >>>> <plugins> >>>> <plugin> >>>> @@ -873,6 +862,26 @@ >>>> >>>> <profiles> >>>> <profile> >>>> + <id>with-jetm</id> >>>> + <activation> >>>> + <!-- remember to comment out the jetm-monitoring import line >>>> from spring-server.xml if you de-activate this >>>> + --> >>>> + <activeByDefault>true</activeByDefault> >>>> + </activation> >>>> + <dependencies> >>>> + <dependency> >>>> + <groupId>fm.void.jetm</groupId> >>>> + <artifactId>jetm</artifactId> >>>> + <version>1.2.3</version> >>>> + </dependency> >>>> + <dependency> >>>> + <groupId>fm.void.jetm</groupId> >>>> + <artifactId>jetm-optional</artifactId> >>>> + <version>1.2.3</version> >>>> + </dependency> >>>> + </dependencies> >>>> + </profile> >>>> + <profile> >>>> <id>make-deb</id> >>>> <build> >>>> <!-- copy resources and filter properties --> >>>> >>>> Modified: >>>> james/app/trunk/src/main/resources/META-INF/org/apache/james/spring-server.xml >>>> URL: >>>> http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1339519&r1=1339518&r2=1339519&view=diff >>>> ============================================================================== >>>> --- >>>> james/app/trunk/src/main/resources/META-INF/org/apache/james/spring-server.xml >>>> (original) >>>> +++ >>>> james/app/trunk/src/main/resources/META-INF/org/apache/james/spring-server.xml >>>> Thu May 17 08:45:42 2012 >>>> @@ -22,12 +22,10 @@ >>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >>>> xmlns:camel="http://camel.apache.org/schema/spring"; >>>> xmlns:amq="http://activemq.apache.org/schema/core"; >>>> - xmlns:jetm="http://jetm.void.fm/schema/jetm_spring_config_1_2"; >>>> xsi:schemaLocation=" >>>> http://www.springframework.org/schema/beans >>>> classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd >>>> http://camel.apache.org/schema/spring classpath:camel-spring.xsd >>>> - http://activemq.apache.org/schema/core classpath:activemq.xsd >>>> - http://jetm.void.fm/schema/jetm_spring_config_1_2 >>>> http://jetm.void.fm/schema/jetm_spring_config_1_2.xsd";> >>>> + http://activemq.apache.org/schema/core classpath:activemq.xsd"> >>>> >>>> <!-- >>>> >>>> =========================================================================== >>>> @@ -418,58 +416,9 @@ >>>> <bean id="mailboxcopiermanagement" >>>> class="org.apache.james.container.spring.mailbox.MailboxCopierManagement" >>>> /> >>>> <bean id="james23importermanagement" >>>> class="org.apache.james.container.spring.tool.James23ImporterManagement" /> >>>> >>>> - <!-- >>>> - jetm performance monitoring >>>> - --> >>>> - <bean id="etmMonitor" class="etm.core.monitor.NestedMonitor" >>>> - init-method="start" destroy-method="stop" /> >>>> - <bean id="etmHttpConsole" >>>> class="etm.contrib.console.HttpConsoleServer" >>>> - init-method="start" destroy-method="stop" >>>> autowire="constructor"/> >>>> - >>>> - <bean id="etmMethodCallInterceptor" >>>> - class="etm.contrib.aop.aopalliance.EtmMethodCallInterceptor" >>>> - autowire="constructor"/> >>>> - >>>> - <bean id="etmAutoProxy" >>>> - >>>> class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator"> >>>> - <property name="interceptorNames"> >>>> - <list> >>>> - <value>etmMethodCallInterceptor</value> >>>> - </list> >>>> - </property> >>>> - <!-- add the beans that you wish to monitor to the list bellow --> >>>> - <property name="beanNames"> >>>> - <list> >>>> - <value>usersrepository</value> >>>> - <value>recipientrewritetable</value> >>>> - <value>domainlist</value> >>>> - <value>mailrepositorystore</value> >>>> - <!-- >>>> - The folowing beans require CGLIB2 to be on the classpath --> >>>> - <!-- >>>> - <value>mailqueuefactory</value> >>>> - <value>blobTransferPolicy</value> >>>> - <value>jmsConnectionFactory</value> >>>> - --> >>>> - <value>jmsTransactionManager</value> >>>> - <value>mailprocessor</value> >>>> - <value>mailetcontext</value> >>>> - <value>mailspooler</value> >>>> - <value>mailetloader</value> >>>> - <value>matcherloader</value> >>>> - <value>filesystem</value> >>>> - <value>dnsservice</value> >>>> - <value>fetchmail</value> >>>> - <value>smtpserver</value> >>>> - <value>pop3server</value> >>>> - <value>lmtpserver</value> >>>> - <value>imapserver</value> >>>> - <value>imapDecoder</value> >>>> - <value>imapEncoder</value> >>>> - <value>locker</value> >>>> - <value>datasource</value> >>>> - </list> >>>> - </property> >>>> - </bean> >>>> +<!-- uncomment the folowing line to enable JETM monitoring --> >>>> +<!-- >>>> + <import resource="classpath:jetm-monitoring.conf" /> >>>> +--> >>>> >>>> </beans> >>>> >>>> Added: james/app/trunk/src/main/resources/jetm-monitoring.conf >>>> URL: >>>> http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/jetm-monitoring.conf?rev=1339519&view=auto >>>> ============================================================================== >>>> --- james/app/trunk/src/main/resources/jetm-monitoring.conf (added) >>>> +++ james/app/trunk/src/main/resources/jetm-monitoring.conf Thu May 17 >>>> 08:45:42 2012 >>>> @@ -0,0 +1,85 @@ >>>> +<?xml version="1.0" encoding="UTF-8"?> >>>> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> >>>> +<!-- >>>> +/** >>>> + * Copyright 2010 The Apache Software Foundation >>>> + * >>>> + * 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. >>>> + */ >>>> +--> >>>> +<beans xmlns="http://www.springframework.org/schema/beans"; >>>> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >>>> + xmlns:jetm="http://jetm.void.fm/schema/jetm_spring_config_1_2"; >>>> + xsi:schemaLocation="http://www.springframework.org/schema/beans >>>> http://www.springframework.org/schema/beans/spring-beans-3.0.xsd >>>> + http://jetm.void.fm/schema/jetm_spring_config_1_2 >>>> http://jetm.void.fm/schema/jetm_spring_config_1_2.xsd";> >>>> + >>>> + <!-- >>>> + Jetm performance monitoring - you can report performance metrics via: >>>> + console, HTTP console and JMX. Please see >>>> http://jetm.void.fm/doc.html for details >>>> + --> >>>> + <bean id="etmMonitor" class="etm.core.monitor.NestedMonitor" >>>> + init-method="start" destroy-method="stop" /> >>>> + <bean id="etmHttpConsole" >>>> class="etm.contrib.console.HttpConsoleServer" >>>> + init-method="start" destroy-method="stop" >>>> autowire="constructor"/> >>>> + >>>> + <bean id="etmMethodCallInterceptor" >>>> + class="etm.contrib.aop.aopalliance.EtmMethodCallInterceptor" >>>> + autowire="constructor"/> >>>> + >>>> + <bean id="etmAutoProxy" >>>> + >>>> class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator"> >>>> + <property name="interceptorNames"> >>>> + <list> >>>> + <value>etmMethodCallInterceptor</value> >>>> + </list> >>>> + </property> >>>> + <!-- add the beans that you wish to monitor to the list bellow --> >>>> + <property name="beanNames"> >>>> + <list> >>>> + <value>usersrepository</value> >>>> + <value>recipientrewritetable</value> >>>> + <value>domainlist</value> >>>> + <value>mailrepositorystore</value> >>>> + <!-- >>>> + The folowing beans require CGLIB2 to be on the classpath --> >>>> + <!-- >>>> + <value>mailqueuefactory</value> >>>> + <value>blobTransferPolicy</value> >>>> + <value>jmsConnectionFactory</value> >>>> + --> >>>> + <value>jmsTransactionManager</value> >>>> + <value>mailprocessor</value> >>>> + <value>mailetcontext</value> >>>> + <value>mailspooler</value> >>>> + <value>mailetloader</value> >>>> + <value>matcherloader</value> >>>> + <value>filesystem</value> >>>> + <value>dnsservice</value> >>>> + <value>fetchmail</value> >>>> + <value>smtpserver</value> >>>> + <value>pop3server</value> >>>> + <value>lmtpserver</value> >>>> + <value>imapserver</value> >>>> + <value>imapDecoder</value> >>>> + <value>imapEncoder</value> >>>> + <value>locker</value> >>>> + <value>datasource</value> >>>> + </list> >>>> + </property> >>>> + </bean> >>>> + >>>> +</beans> >>>> >>>> >>>> >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: [email protected] >>>> For additional commands, e-mail: [email protected] >>>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: [email protected] >>> For additional commands, e-mail: [email protected] >>> >> >> >> >> -- >> Ioan Eugen Stan >> http://ieugen.blogspot.com/ *** http://bucharest-jug.github.com/ *** > > > > -- > Ioan Eugen Stan > http://ieugen.blogspot.com/ *** http://bucharest-jug.github.com/ *** > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
