[Jpackage-commits] rpms/free/inspektr inspektr-core-log4j.patch, NONE, 1.1.2.1 inspektr-core-pom.patch, NONE, 1.1.2.1 inspektr-core-testContext.patch, NONE, 1.1.2.1 inspektr-jpp-depmap.xml, NONE, 1.1.2.1 inspektr-settings.xml, NONE, 1.1.2.1 inspektr.spec, NONE, 1.1.2.1

jpackage jpackage at ryu.zarb.org
Wed Feb 4 09:14:10 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/inspektr
In directory ryu.zarb.org:/tmp/CgoUpWA9vY/rpms/free/inspektr

Added Files:
      Tag: JPACKAGE-5_0
	inspektr-core-log4j.patch inspektr-core-pom.patch 
	inspektr-core-testContext.patch inspektr-jpp-depmap.xml 
	inspektr-settings.xml inspektr.spec 
Log Message:
0.6.1-1.jpp5

--- NEW FILE: inspektr-core-log4j.patch ---
--- inspektr-core/src/test/resources/log4j.properties.sav	2008-07-16 10:52:06.000000000 +0200
+++ inspektr-core/src/test/resources/log4j.properties	2008-07-16 10:52:24.000000000 +0200
@@ -5,7 +5,7 @@
 log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
 
 log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${ess-inspektr.root}/ess-inspektr.log
+log4j.appender.logfile.File=ess-inspektr.log
 log4j.appender.logfile.MaxFileSize=512KB
 
 # Keep three backup files

--- NEW FILE: inspektr-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
         <version>2.5.1</version>
      </maven>
      <jpp>
         <groupId>JPP/spring2</groupId>
         <artifactId>context-support</artifactId>
         <version>2.5.1</version>
      </jpp>
   </dependency>

 <dependency>
   <maven>
     <groupId>javax.servlet</groupId>
     <artifactId>servlet-api</artifactId>
     <version>2.4</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>servlet_2_4_api</artifactId>
     <version>2.4</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>javax.jms</groupId>
     <artifactId>jms</artifactId>
     <version>1.1</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jms_1_1_api</artifactId>
     <version>1.1</version>
   </jpp>
 </dependency>

  <dependency>
        <maven>
          <groupId>hsqldb</groupId>
          <artifactId>hsqldb</artifactId>
          <version>1.8.0.1</version>
        </maven>
        <jpp>
          <groupId>JPP</groupId>
          <artifactId>hsqldb</artifactId>
          <version>1.8.0.8</version>
        </jpp>
  </dependency>

</dependencies>

--- NEW FILE: inspektr-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: inspektr.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section free

Summary:        Non-Intruisive Auditing and Logging 
Name:           inspektr
Version:        0.6.1
Release:        1%{dist}
Epoch:          0
Group:          Development/Libraries
License:        Apache Software License 2.0
URL:            http://code.google.com/p/inspektr/
Source0:        inspektr-0.6.1.tar.gz
# svn export http://inspektr.googlecode.com/svn/tags/inspektr-0-6-1/ inspektr-0.6.1

Source1:        %{name}-jpp-depmap.xml
Source2:        %{name}-settings.xml

Patch0:         inspektr-core-pom.patch
Patch1:         inspektr-core-testContext.patch
Patch2:         inspektr-core-log4j.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  junit
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven2-plugin-surefire

BuildRequires:  excalibur-avalon-framework
BuildRequires:  servlet_2_4_api
BuildRequires:  spring2-beans
BuildRequires:  spring2-jdbc
BuildRequires:  spring2-test
BuildRequires:  spring2-webmvc

Requires:  java >= 0:1.5.0
Requires:  excalibur-avalon-framework
Requires:  servlet_2_4_api
Requires:  spring2-beans
Requires:  spring2-jdbc
Requires:  spring2-webmvc

Requires(post):   jpackage-utils >= 0:1.7.5
Requires(postun): jpackage-utils >= 0:1.7.5

%if %{gcj_support}
BuildRequires:          java-gcj-compat-devel
Requires(post):         java-gcj-compat
Requires(postun):       java-gcj-compat
%endif
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
The Inspektr project allows for non-intrusive auditing and 
logging by using annotations and aspects.
It also includes a generic Grails-based web application to 
view statistics and audit logs stored in various data 
sources.

%package javadoc
Group:          Development/Documentation
Summary:        Javadoc for %{name}

%description javadoc
%{summary}.

%prep
%setup -q 

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2

%build
cp %{SOURCE2} maven2-settings.xml

sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" maven2-settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export M2SETTINGS=$(pwd)/maven2-settings.xml
export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository

mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        -Dmaven.test.failure.ignore=true \
        install javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.inspektr inspektr %{version} JPP %{name}

install -m 644 inspektr-core/target/inspektr-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar
install -m 644 inspektr-core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-core.pom
%add_to_maven_depmap org.inspektr inspektr-core %{version} JPP %{name}-core

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)


# javadoc
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
cp -pr inspektr-core/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Wed Feb 04 2009 Ralph Apel <r.apel at r-apel.de> 0:0.6.1-1.jpp5
- Initial release


--- NEW FILE: inspektr-core-testContext.patch ---
--- inspektr-core/src/test/resources/testContext.xml.sav1	2008-02-03 03:42:16.000000000 +0100
+++ inspektr-core/src/test/resources/testContext.xml	2008-07-16 11:39:12.000000000 +0200
@@ -19,58 +19,64 @@
     </bean>
     
     <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" >
-		<property name="driverClassName" value="oracle.jdbc.OracleDriver" />
-		<property name="url" value="jdbc:oracle:thin:@acs3-db.ess.rutgers.edu:1521:acs3" />
-		<property name="username" value="WEB_PAC" />
-		<property name="password" value="pac3user938256128" />
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="jdbc:hsqldb:file:testdb" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
 	</bean>
 	
 	<bean id="auditableBean" class="org.inspektr.audit.SimpleAuditableBean"/>
 	
     <bean id="auditAspect" class="org.inspektr.audit.AuditTrailManagementAspect">
-		<property name="resourceResolvers">
+                <constructor-arg index="0" >
+			<bean class="org.inspektr.audit.SimpleAuditablePrincipalResolver"/>
+                </constructor-arg>
+                <constructor-arg index="1" >
 			<list>
 				<bean class="org.inspektr.audit.SimpleAuditableResourceResolver"/>
 			</list>
-		</property>
-		<property name="auditTrailManagers">
+                </constructor-arg>
+                <constructor-arg index="2" >
 			<list>
 				<bean class="org.inspektr.audit.support.ConsoleAuditTrailManager"/>
-				<bean class="org.inspektr.audit.support.Log4jAuditTrailManager"/>
+				<bean class="org.inspektr.audit.support.CommonsLoggingAuditTrailManager"/>
+<!--
 				<ref bean="jdbcAuditTrailManager"/>
+-->
 			</list>
-		</property>
-		<property name="auditablePrincipalResolver">
-			<bean class="org.inspektr.audit.SimpleAuditablePrincipalResolver"/>
-		</property>
+                </constructor-arg>
+                <constructor-arg index="3" value="TEST" />
+
 	</bean>
 	
+<!--
 	<bean id="jdbcAuditTrailManager"
 	      class="org.inspektr.audit.support.JdbcAuditTrailManager">
-	      <property name="dataSource" ref="dataSource"/>
+                <constructor-arg index="0" ref="dataSource"/>
 	</bean>
+-->
 	
 	<bean id="errorLogManager"
-	      class="org.inspektr.errorlog.support.DefaultErrorLogManager">
+	      class="org.inspektr.error.support.DefaultErrorLogManager">
 	      <constructor-arg index="0" value="TEST"/>
 	      <constructor-arg index="1">
 	          <list>
-	              <bean class="org.inspektr.errorlog.support.Log4jErrorReporter"/>
+	              <bean class="org.inspektr.error.support.CommonsLoggingErrorReporter"/>
 	          </list>
 	      </constructor-arg>
 	      <property name="currentContextPrincipalResolver">
-	          <bean class="org.inspektr.errorlog.TrivialCurrentContextPrincipalResolver"/>
+	          <bean class="org.inspektr.error.TrivialCurrentContextPrincipalResolver"/>
 	      </property>
 	</bean>
 	
 	<bean id="handlerExceptionResolver" 
-	      class="org.inspektr.errorlog.web.ErrorLogHandlerExceptionResolver">
+	      class="org.inspektr.error.web.ErrorLogHandlerExceptionResolver">
 	      <constructor-arg index="0" ref="errorLogManager"/>
 	      <property name="order" value="0"/>
 	</bean>
 	
 	<bean id="errorLoggingFilter"
-	      class="org.inspektr.errorlog.web.ErrorLoggingFilter">
+	      class="org.inspektr.error.web.ErrorLoggingFilter">
 	      <property name="errorLogManager" ref="errorLogManager"/>
 	</bean>
 	

--- NEW FILE: inspektr-core-pom.patch ---
--- inspektr-core/pom.xml.sav	2008-07-16 10:55:34.000000000 +0200
+++ inspektr-core/pom.xml	2008-07-16 10:57:25.000000000 +0200
@@ -63,6 +63,13 @@
 		</dependency>
 
 		<dependency>
+                        <groupId>hsqldb</groupId>
+                        <artifactId>hsqldb</artifactId>
+                        <version>1.8.0.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 			<version>2.5.1</version>




More information about the JPackage-commits mailing list