[uportal-dev] resources aggregation now in trunk

2009-11-19 Thread Nicholas Blair
I've just committed the resources aggregation process described in
UP-2505 on to trunk. There is one caveat: it's currently not enabled.

layout/theme/universality/page.xsl contains a comment that shows what
needs to be done to switch. I've commented it out because it works for
everything but the guest layout.
It's odd too, sometimes the guest layout renders all the appropriate
link and script tags perfectly as described in the skin, other times
it only renders the first CSS link.

In the case this problem occurs, ResourcesXalanElements (the class
that the XSL uses to render the link/script tags from the skin
configuration) doesn't even run (I've set a breakpoint on the first
line in the class, and it doesn't get tripped).

Chatting briefly with Eric he suggested it may be a guest layout
caching issue; let me know if you have any thoughts or see anything
that may be wrong.

Thanks!
Nick

-- 
You are currently subscribed to uportal-dev@lists.ja-sig.org as: 
arch...@mail-archive.com
To unsubscribe, change settings or access archives, see 
http://www.ja-sig.org/wiki/display/JSG/uportal-dev


[uportal-dev] maven plugin tests again

2009-11-19 Thread Susan Bramhall




I am attempting to add additional info messages to the deploy ear mojo
to track down problems we are having with maven plugin and discovered
that the tests in M2 and trunk fail for me. The issue is that the hard
coded filenames in ResourcesAggregatorImplTest do not match the names
generated when I run the test. It looks they are using some sort of
guid which is not always the same on every machine. I changed the
Assert statements in question to use the file names in the lists
returned from ResourceAggregatorImpl. Not sure if this tests what you
intend but it passes. Patch is below.
Susan
==patch=
Index:
src/test/java/org/jasig/portal/web/skin/ResourcesAggregatorImplTest.java
===
---
src/test/java/org/jasig/portal/web/skin/ResourcesAggregatorImplTest.java
(revision 47213)
+++
src/test/java/org/jasig/portal/web/skin/ResourcesAggregatorImplTest.java
(working copy)
@@ -154,13 +154,13 @@
  Assert.assertEquals(6, cssList.size());
  ListJs jsList = result.getJs();
  Assert.assertEquals(1, jsList.size());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/css/fluid/uportal3_aggr1_A3661D3474000B0B06BC01EA644DBE07.css").exists());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/css/uportal3_aggr2_0A62110C5DBE25EECD978B41EE455466.css").exists());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/css/uportal3_aggr2_0A62110C5DBE25EECD978B41EE455466.css").exists());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/uportal3/uportal3_aggr3_3334333FF8A41D7D6BCE5C8AE5B71B4A.css").exists());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/uportal3/uportal3_aggr5_0EC69539BB6BA6C8B611BAC539C67794.css").exists());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/uportal3/uportal3_aggr6_F21DFDA90E2DFAEB81BC098A037A458C.css").exists());
-  Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/_javascript_/uportal/uportal3_aggr7_158C92140AC7355300F2708F20D66DB2.js").exists());
+  
+ Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/" + cssList.get(0).getValue()).exists());
+ Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/" + cssList.get(1).getValue()).exists());
+ Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/uportal3/" + cssList.get(2).getValue()).exists());
+ Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/uportal3/" + cssList.get(4).getValue()).exists());
+ Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/uportal3/" + cssList.get(5).getValue()).exists());
+ Assert.assertTrue(new File(getTestOutputRoot() +
"/skin-universality/common/" + jsList.get(0).getValue()).exists());
 }

 /**

-- 




Susan Bramhall (susan.bramh...@yale.edu)
Senior Developer, Infrastructure Systems and Architecture (formerly
TP)
Yale University Information Technology Services (ITS)
25 Science Park, 150 Munson St, New Haven, CT 06520
Phone: 203 432 6697



-- 
You are currently subscribed to uportal-dev@lists.ja-sig.org as: arch...@mail-archive.comTo unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/uportal-dev