--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,39 +18,41 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/apache-jk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="Tomcat Connector plugin for Apache Web Server V2.2"
+set name=pkg.summary value="Tomcat Connector plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="Tomcat Connector plugin for Apache Web Server Version 2.2"
-set name=com.oracle.info.description value="the Tomcat Connector plugin for Apache Web Server V2.2"
+set name=com.oracle.info.description \
+    value="the Tomcat Connector plugin for Apache Web Server V2.2"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/090
+set name=org.opensolaris.arc-caseid value=PSARC/2008/090
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir  path=etc
+dir  path=etc/apache2
+dir  path=etc/apache2/2.2
+dir  path=etc/apache2/2.2/conf.d
+file jk.conf path=etc/apache2/2.2/conf.d/jk.conf mode=0644 \
+    original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/jk.conf \
+    preserve=renamenew
+file workers.properties path=etc/apache2/2.2/conf.d/workers.properties \
+    mode=0644 \
+    original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/workers.properties \
+    preserve=renamenew
+dir  path=usr
+dir  path=usr/apache2
+dir  path=usr/apache2/2.2
+dir  path=usr/apache2/2.2/libexec
+dir  path=usr/apache2/2.2/libexec/$(MACH64)
+file build/$(MACH64)/apache-2.0/mod_jk.so \
+    path=usr/apache2/2.2/libexec/$(MACH64)/mod_jk.so
+file build/$(MACH32)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/mod_jk.so
 
 
 license apache.license license="Apache v2.0"
-
-dir path=etc
-dir path=etc/apache2
-dir path=etc/apache2/2.2
-dir path=etc/apache2/2.2/conf.d
-dir path=usr
-dir path=usr/apache2
-dir path=usr/apache2/2.2
-dir path=usr/apache2/2.2/libexec
-dir path=usr/apache2/2.2/libexec/$(MACH64)
-file jk.conf path=etc/apache2/2.2/conf.d/jk.conf mode=0644 preserve=renamenew \
-    original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/jk.conf
-file workers.properties path=etc/apache2/2.2/conf.d/workers.properties mode=0644 preserve=renamenew \
-    original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/workers.properties
-file build/$(MACH32)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/mod_jk.so
-file build/$(MACH64)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_jk.so